diff --git a/src/Dollet.Presentation/Maui/AppShell.xaml b/src/Dollet.Presentation/Maui/AppShell.xaml
index 4133696..abe8375 100644
--- a/src/Dollet.Presentation/Maui/AppShell.xaml
+++ b/src/Dollet.Presentation/Maui/AppShell.xaml
@@ -183,23 +183,28 @@
     </FlyoutItem>
 
     <Shell.FlyoutFooter>
-        <HorizontalStackLayout Padding="15, 0, 0, 10" Spacing="10">
-            <Label 
-                Text="{AppThemeBinding Light={x:Static fonts:MaterialDesignIcons.Light_mode}, Dark={x:Static fonts:MaterialDesignIcons.Dark_mode}}"
-                FontFamily="MaterialIconsRegular"
-                FontSize="32"
-                VerticalOptions="Center"/>
-            <Label 
-                Text="Change theme"
-                VerticalOptions="Center"/>
-
-            <Switch>
-                <Switch.Behaviors>
-                    <toolkit:EventToCommandBehavior
-                        EventName="Toggled"
-                        Command="{Binding ChangeAppThemeCommand}"/>
-                </Switch.Behaviors>
-            </Switch>
-        </HorizontalStackLayout>
+        <VerticalStackLayout>
+            <Border/>
+            <Grid Margin="20, 0, 20, 0" ColumnDefinitions="auto, *, auto">
+                <Label 
+                    Text="{AppThemeBinding Light={x:Static fonts:MaterialDesignIcons.Light_mode}, Dark={x:Static fonts:MaterialDesignIcons.Dark_mode}}"
+                    FontFamily="MaterialIconsRegular"
+                    FontSize="32"
+                    Margin="0, 0, 30, 0"
+                    VerticalOptions="Center"/>
+                <Label 
+                    Grid.Column="1"
+                    Text="Change theme"
+                    VerticalOptions="Center"/>
+
+                <Switch Grid.Column="2">
+                    <Switch.Behaviors>
+                        <toolkit:EventToCommandBehavior
+                            EventName="Toggled"
+                            Command="{Binding ChangeAppThemeCommand}"/>
+                    </Switch.Behaviors>
+                </Switch>
+            </Grid>
+        </VerticalStackLayout>
     </Shell.FlyoutFooter>
 </Shell>