diff --git a/lib/fido/views/passkeys_screen.dart b/lib/fido/views/passkeys_screen.dart
index 622d38d8..6c99d2ed 100644
--- a/lib/fido/views/passkeys_screen.dart
+++ b/lib/fido/views/passkeys_screen.dart
@@ -428,23 +428,7 @@ class _FidoUnlockedPageState extends ConsumerState<_FidoUnlockedPage> {
                           ),
                         if (searchController.text.isEmpty &&
                             !searchFocus.hasFocus &&
-                            showLayoutOptions) ...[
-                          Row(
-                            mainAxisSize: MainAxisSize.min,
-                            mainAxisAlignment: MainAxisAlignment.center,
-                            children: [
-                              Padding(
-                                // need this to maintain consistent distance
-                                // between icons
-                                padding: const EdgeInsets.only(left: 17.0),
-                                child: Container(
-                                  color: Theme.of(context).colorScheme.surface,
-                                  width: 1,
-                                  height: 45,
-                                ),
-                              ),
-                            ],
-                          ),
+                            showLayoutOptions)
                           ...FlexLayout.values.map(
                             (e) => MouseRegion(
                               onEnter: (event) {
@@ -475,7 +459,6 @@ class _FidoUnlockedPageState extends ConsumerState<_FidoUnlockedPage> {
                               ),
                             ),
                           ),
-                        ]
                       ],
                     ),
                     onChanged: (value) {
diff --git a/lib/oath/views/oath_screen.dart b/lib/oath/views/oath_screen.dart
index b74377bc..9b7486f9 100755
--- a/lib/oath/views/oath_screen.dart
+++ b/lib/oath/views/oath_screen.dart
@@ -454,23 +454,7 @@ class _UnlockedViewState extends ConsumerState<_UnlockedView> {
                           ),
                         if (searchController.text.isEmpty &&
                             !searchFocus.hasFocus) ...[
-                          Row(
-                            mainAxisSize: MainAxisSize.min,
-                            mainAxisAlignment: MainAxisAlignment.center,
-                            children: [
-                              Padding(
-                                // need this to maintain consistent distance
-                                // between icons
-                                padding: const EdgeInsets.only(left: 17.0),
-                                child: Container(
-                                  color: Theme.of(context).colorScheme.surface,
-                                  width: 1,
-                                  height: 45,
-                                ),
-                              ),
-                            ],
-                          ),
-                          if (width >= 380)
+                          if (width >= 450)
                             ...availableLayouts.map(
                               (e) => MouseRegion(
                                 onEnter: (event) {
@@ -497,11 +481,12 @@ class _UnlockedViewState extends ConsumerState<_UnlockedView> {
                                     color: e == oathLayout
                                         ? Theme.of(context).colorScheme.primary
                                         : null,
+                                    fill: e == oathLayout ? 1 : 0,
                                   ),
                                 ),
                               ),
                             ),
-                          if (width < 380)
+                          if (width < 450)
                             MouseRegion(
                               onEnter: (event) {
                                 if (!searchFocus.hasFocus) {
@@ -523,6 +508,7 @@ class _UnlockedViewState extends ConsumerState<_UnlockedView> {
                                 icon: Icon(
                                   oathLayout._icon,
                                   color: Theme.of(context).colorScheme.primary,
+                                  fill: 1,
                                 ),
                                 itemBuilder: (context) => [
                                   ...availableLayouts.map(
diff --git a/lib/widgets/flex_box.dart b/lib/widgets/flex_box.dart
index f2c20b3f..8d81033f 100644
--- a/lib/widgets/flex_box.dart
+++ b/lib/widgets/flex_box.dart
@@ -3,8 +3,8 @@ import 'package:flutter_gen/gen_l10n/app_localizations.dart';
 import 'package:material_symbols_icons/symbols.dart';
 
 enum FlexLayout {
-  grid,
-  list;
+  list,
+  grid;
 
   IconData get icon => switch (this) {
         FlexLayout.list => Symbols.list,