diff --git a/IceCubesApp/App/SideBarView.swift b/IceCubesApp/App/SideBarView.swift
index d75a8170..9d3f0118 100644
--- a/IceCubesApp/App/SideBarView.swift
+++ b/IceCubesApp/App/SideBarView.swift
@@ -23,7 +23,7 @@ struct SideBarView<Content: View>: View {
                                   accountCreationEnabled: false,
                                   avatarSize: .status)
         }
-        .frame(width: 70, height: 60)
+        .frame(width: 80, height: 60)
         .background(selectedTab == .profile ? theme.secondaryBackgroundColor : .clear)
         ForEach(tabs) { tab in
           Button {
@@ -41,12 +41,12 @@ struct SideBarView<Content: View>: View {
               .frame(width: 24, height: 24)
               .foregroundColor(tab == selectedTab ? theme.tintColor : .gray)
           }
-          .frame(width: 70, height: 50)
+          .frame(width: 80, height: 50)
           .background(tab == selectedTab ? theme.secondaryBackgroundColor : .clear)
         }
         Spacer()
       }
-      .frame(width: 70)
+      .frame(width: 80)
       .background(.clear)
       Divider()
         .edgesIgnoringSafeArea(.top)
diff --git a/IceCubesApp/App/Tabs/ExploreTab.swift b/IceCubesApp/App/Tabs/ExploreTab.swift
index 68a913e5..503679b1 100644
--- a/IceCubesApp/App/Tabs/ExploreTab.swift
+++ b/IceCubesApp/App/Tabs/ExploreTab.swift
@@ -22,7 +22,7 @@ struct ExploreTab: View {
         .toolbar {
           statusEditorToolbarItem(routeurPath: routeurPath,
                                   visibility: preferences.serverPreferences?.postVisibility ?? .pub)
-          if !ProcessInfo.processInfo.isiOSAppOnMac {
+          if UIDevice.current.userInterfaceIdiom != .pad {
             ToolbarItem(placement: .navigationBarLeading) {
               AppAccountsSelectorView(routeurPath: routeurPath)
             }
diff --git a/IceCubesApp/App/Tabs/MessagesTab.swift b/IceCubesApp/App/Tabs/MessagesTab.swift
index 1f965266..69ae1815 100644
--- a/IceCubesApp/App/Tabs/MessagesTab.swift
+++ b/IceCubesApp/App/Tabs/MessagesTab.swift
@@ -21,7 +21,7 @@ struct MessagesTab: View {
         .withAppRouteur()
         .withSheetDestinations(sheetDestinations: $routeurPath.presentedSheet)
         .toolbar {
-          if !ProcessInfo.processInfo.isiOSAppOnMac {
+          if UIDevice.current.userInterfaceIdiom != .pad {
             ToolbarItem(placement: .navigationBarLeading) {
               AppAccountsSelectorView(routeurPath: routeurPath)
             }
diff --git a/IceCubesApp/App/Tabs/NotificationTab.swift b/IceCubesApp/App/Tabs/NotificationTab.swift
index b1ae19f0..dca60435 100644
--- a/IceCubesApp/App/Tabs/NotificationTab.swift
+++ b/IceCubesApp/App/Tabs/NotificationTab.swift
@@ -21,7 +21,7 @@ struct NotificationsTab: View {
         .toolbar {
           statusEditorToolbarItem(routeurPath: routeurPath,
                                   visibility: userPreferences.serverPreferences?.postVisibility ?? .pub)
-          if !ProcessInfo.processInfo.isiOSAppOnMac {
+          if UIDevice.current.userInterfaceIdiom != .pad {
             ToolbarItem(placement: .navigationBarLeading) {
               AppAccountsSelectorView(routeurPath: routeurPath)
             }
diff --git a/IceCubesApp/App/Tabs/Timeline/TimelineTab.swift b/IceCubesApp/App/Tabs/Timeline/TimelineTab.swift
index 7d14d31a..90c4f587 100644
--- a/IceCubesApp/App/Tabs/Timeline/TimelineTab.swift
+++ b/IceCubesApp/App/Tabs/Timeline/TimelineTab.swift
@@ -138,7 +138,7 @@ struct TimelineTab: View {
       }
     }
     if client.isAuth {
-      if !ProcessInfo.processInfo.isiOSAppOnMac {
+      if UIDevice.current.userInterfaceIdiom != .pad {
         ToolbarItem(placement: .navigationBarLeading) {
           AppAccountsSelectorView(routeurPath: routeurPath)
         }
diff --git a/Packages/AppAccount/Sources/AppAccount/AppAccountsSelectorView.swift b/Packages/AppAccount/Sources/AppAccount/AppAccountsSelectorView.swift
index 33da32b0..9980c879 100644
--- a/Packages/AppAccount/Sources/AppAccount/AppAccountsSelectorView.swift
+++ b/Packages/AppAccount/Sources/AppAccount/AppAccountsSelectorView.swift
@@ -23,7 +23,7 @@ public struct AppAccountsSelectorView: View {
   
   public var body: some View {
     Group {
-      if ProcessInfo.processInfo.isiOSAppOnMac {
+      if UIDevice.current.userInterfaceIdiom == .pad {
         labelView
           .contextMenu {
             menuView