diff --git a/Packages/App/Sources/AppUIMain/Views/App/AppCoordinator.swift b/Packages/App/Sources/AppUIMain/Views/App/AppCoordinator.swift
index 89f58911..07a5b1f5 100644
--- a/Packages/App/Sources/AppUIMain/Views/App/AppCoordinator.swift
+++ b/Packages/App/Sources/AppUIMain/Views/App/AppCoordinator.swift
@@ -137,6 +137,9 @@ extension AppCoordinator {
         if isUITesting {
             return isBigDevice ? .grid : .list
         }
+        guard isBigDevice else {
+            return .list
+        }
         return layout
     }
 
diff --git a/Packages/App/Sources/AppUIMain/Views/App/AppToolbar.swift b/Packages/App/Sources/AppUIMain/Views/App/AppToolbar.swift
index 5ff95485..0d92f398 100644
--- a/Packages/App/Sources/AppUIMain/Views/App/AppToolbar.swift
+++ b/Packages/App/Sources/AppUIMain/Views/App/AppToolbar.swift
@@ -65,9 +65,8 @@ struct AppToolbar: ToolbarContent, SizeClassProviding {
             ToolbarItem(placement: .navigation) {
                 aboutButton
             }
-            ToolbarItemGroup(placement: .primaryAction) {
+            ToolbarItem(placement: .primaryAction) {
                 addProfileMenu
-                layoutPicker
             }
         }
     }