diff --git a/src/Lively/Lively.UI.WinUI/Views/Pages/ControlPanel/ScreensaverLayoutView.xaml b/src/Lively/Lively.UI.WinUI/Views/Pages/ControlPanel/ScreensaverLayoutView.xaml
index 85517664..4866b9a7 100644
--- a/src/Lively/Lively.UI.WinUI/Views/Pages/ControlPanel/ScreensaverLayoutView.xaml
+++ b/src/Lively/Lively.UI.WinUI/Views/Pages/ControlPanel/ScreensaverLayoutView.xaml
@@ -51,14 +51,23 @@
                 <Button IsEnabled="{Binding IsScreensaverLayout, Mode=OneWay}">
                     <Button.Flyout>
                         <Flyout>
-                            <Grid CornerRadius="5">
+                            <Flyout.FlyoutPresenterStyle>
+                                <Style TargetType="FlyoutPresenter">
+                                    <Setter Property="Padding" Value="0" />
+                                    <Setter Property="CornerRadius" Value="5" />
+                                </Style>
+                            </Flyout.FlyoutPresenterStyle>
+                            <Grid
+                                BorderBrush="{ThemeResource ControlElevationBorderBrush}"
+                                BorderThickness="1"
+                                CornerRadius="5">
                                 <ListBox
                                     Padding="-2.5"
                                     Background="{ThemeResource ApplicationPageBackgroundThemeBrush}"
                                     SelectedIndex="{Binding SelectedScreensaverArrangementIndex, Mode=TwoWay}">
                                     <TextBlock>
                                         <Run x:Uid="WallpaperLayoutPerScreen" />
-                                        <Run Foreground="{ThemeResource SystemAccentColorLight2}" Text="{Binding SelectedItem.Screen.Index, Mode=OneWay, Converter={StaticResource StringFormatConverter}, ConverterParameter='({0})'}" />
+                                        <Run Foreground="{ThemeResource AccentTextFillColorPrimaryBrush}" Text="{Binding SelectedItem.Screen.Index, Mode=OneWay, Converter={StaticResource StringFormatConverter}, ConverterParameter='({0})'}" />
                                     </TextBlock>
                                     <TextBlock x:Uid="WallpaperLayoutSpan" />
                                     <TextBlock x:Uid="WallpaperLayoutDuplicate" />
@@ -71,7 +80,13 @@
                             </Grid>
                         </Flyout>
                     </Button.Flyout>
-                    <FontIcon FontSize="16" Glyph="&#xE7F4;" />
+                    <StackPanel Orientation="Horizontal" Spacing="5">
+                        <FontIcon FontSize="16" Glyph="&#xE7F4;" />
+                        <TextBlock
+                            Margin="0,-2.5,0,0"
+                            Foreground="{ThemeResource AccentTextFillColorPrimaryBrush}"
+                            Text="{Binding SelectedItem.Screen.Index, Mode=OneWay, Converter={StaticResource StringFormatConverter}, ConverterParameter='({0})'}" />
+                    </StackPanel>
                 </Button>
                 <Button Command="{Binding AddScreensaverCommand}">
                     <FontIcon FontSize="16" Glyph="&#xE8A9;" />
@@ -145,7 +160,10 @@
             </controls:SettingsExpander.HeaderIcon>
             <controls:SettingsExpander.Items>
                 <controls:SettingsCard ContentAlignment="Left">
-                    <Grid CornerRadius="5">
+                    <Grid
+                        BorderBrush="{ThemeResource ControlElevationBorderBrush}"
+                        BorderThickness="1"
+                        CornerRadius="5">
                         <ListBox Padding="-2.5" SelectedIndex="{Binding SelectedScreensaverTypeIndex, Mode=TwoWay}">
                             <TextBlock x:Uid="ScreensaverModeSameWallpaper" />
                             <TextBlock x:Uid="ScreensaverModeDifferentWallpaper" />
diff --git a/src/Lively/Lively.UI.WinUI/Views/Pages/ControlPanel/WallpaperLayoutView.xaml b/src/Lively/Lively.UI.WinUI/Views/Pages/ControlPanel/WallpaperLayoutView.xaml
index 5b0cd34a..02dbda87 100644
--- a/src/Lively/Lively.UI.WinUI/Views/Pages/ControlPanel/WallpaperLayoutView.xaml
+++ b/src/Lively/Lively.UI.WinUI/Views/Pages/ControlPanel/WallpaperLayoutView.xaml
@@ -64,7 +64,10 @@
             </controls:SettingsExpander.HeaderIcon>
             <controls:SettingsExpander.Items>
                 <controls:SettingsCard ContentAlignment="Left">
-                    <Grid CornerRadius="5">
+                    <Grid
+                        BorderBrush="{ThemeResource ControlElevationBorderBrush}"
+                        BorderThickness="1"
+                        CornerRadius="5">
                         <ListBox Padding="-2.5" SelectedIndex="{Binding SelectedWallpaperLayoutIndex, Mode=TwoWay}">
                             <TextBlock>
                                 <Run x:Uid="WallpaperLayoutPerScreen" />