diff --git a/Flow.Launcher/SettingPages/Views/SettingsPaneGeneral.xaml b/Flow.Launcher/SettingPages/Views/SettingsPaneGeneral.xaml
index edb2c144166..3f8272ddafe 100644
--- a/Flow.Launcher/SettingPages/Views/SettingsPaneGeneral.xaml
+++ b/Flow.Launcher/SettingPages/Views/SettingsPaneGeneral.xaml
@@ -28,16 +28,16 @@
                 Style="{StaticResource PageTitle}"
                 Text="{DynamicResource general}"
                 TextAlignment="left" />
-
-            <cc:CardGroup Margin="0 10 0 0">
-
-                <cc:Card Title="{DynamicResource startFlowLauncherOnSystemStartup}" Icon="&#xe8fc;">
+            <cc:ExCard
+                Title="{DynamicResource startFlowLauncherOnSystemStartup}"
+                Margin="0 8 0 0"
+                Icon="&#xe8fc;">
+                <cc:ExCard.SideContent>
                     <ui:ToggleSwitch
                         IsOn="{Binding StartFlowLauncherOnSystemStartup}"
                         OffContent="{DynamicResource disable}"
                         OnContent="{DynamicResource enable}" />
-                </cc:Card>
-
+                </cc:ExCard.SideContent>
                 <cc:Card
                     Title="{DynamicResource useLogonTaskForStartup}"
                     Sub="{DynamicResource useLogonTaskForStartupTooltip}"
@@ -47,17 +47,16 @@
                         OffContent="{DynamicResource disable}"
                         OnContent="{DynamicResource enable}" />
                 </cc:Card>
-
-                <cc:Card
-                    Title="{DynamicResource hideOnStartup}"
-                    Sub="{DynamicResource hideOnStartupToolTip}"
-                    Type="InsideFit">
-                    <ui:ToggleSwitch
-                        IsOn="{Binding Settings.HideOnStartup}"
-                        OffContent="{DynamicResource disable}"
-                        OnContent="{DynamicResource enable}" />
-                </cc:Card>
-            </cc:CardGroup>
+            </cc:ExCard>
+            <cc:Card
+                Title="{DynamicResource hideOnStartup}"
+                Icon="&#xed1a;"
+                Sub="{DynamicResource hideOnStartupToolTip}">
+                <ui:ToggleSwitch
+                    IsOn="{Binding Settings.HideOnStartup}"
+                    OffContent="{DynamicResource disable}"
+                    OnContent="{DynamicResource enable}" />
+            </cc:Card>
 
             <cc:Card Title="{DynamicResource hideFlowLauncherWhenLoseFocus}" Margin="0 14 0 0">
                 <ui:ToggleSwitch
@@ -178,30 +177,6 @@
                     OnContent="{DynamicResource enable}" />
             </cc:Card>
 
-            <cc:CardGroup Margin="0 14 0 0">
-                <cc:Card
-                    Title="{DynamicResource searchDelay}"
-                    Icon="&#xE961;"
-                    Sub="{DynamicResource searchDelayToolTip}">
-                    <ui:ToggleSwitch
-                        IsOn="{Binding Settings.SearchQueryResultsWithDelay}"
-                        OffContent="{DynamicResource disable}"
-                        OnContent="{DynamicResource enable}" />
-                </cc:Card>
-
-                <cc:Card
-                    Title="{DynamicResource searchDelayTime}"
-                    Icon="&#xE916;"
-                    Sub="{DynamicResource searchDelayTimeToolTip}">
-                    <ComboBox
-                        MaxWidth="200"
-                        DisplayMemberPath="Display"
-                        ItemsSource="{Binding SearchDelayTimes}"
-                        SelectedItem="{Binding SearchDelayTime}"
-                        SelectedValuePath="Value" />
-                </cc:Card>
-            </cc:CardGroup>
-
             <cc:CardGroup Margin="0 14 0 0">
                 <cc:Card Title="{DynamicResource querySearchPrecision}" Sub="{DynamicResource querySearchPrecisionToolTip}">
                     <ComboBox