diff --git a/Flow.Launcher/Languages/en.xaml b/Flow.Launcher/Languages/en.xaml
index 28b516757..50096b5c1 100644
--- a/Flow.Launcher/Languages/en.xaml
+++ b/Flow.Launcher/Languages/en.xaml
@@ -75,6 +75,7 @@
     <system:String x:Key="autoUpdates">Auto Update</system:String>
     <system:String x:Key="select">Select</system:String>
     <system:String x:Key="hideOnStartup">Hide Flow Launcher on startup</system:String>
+    <system:String x:Key="hideOnStartupToolTip">Flow Launcher starts out hidden in the tray.</system:String>
     <system:String x:Key="hideNotifyIcon">Hide tray icon</system:String>
     <system:String x:Key="hideNotifyIconToolTip">When the icon is hidden from the tray, the Settings menu can be opened by right-clicking on the search window.</system:String>
     <system:String x:Key="querySearchPrecision">Query Search Precision</system:String>
diff --git a/Flow.Launcher/SettingPages/Views/SettingsPaneGeneral.xaml b/Flow.Launcher/SettingPages/Views/SettingsPaneGeneral.xaml
index 6b301e33a..a2b1a58a4 100644
--- a/Flow.Launcher/SettingPages/Views/SettingsPaneGeneral.xaml
+++ b/Flow.Launcher/SettingPages/Views/SettingsPaneGeneral.xaml
@@ -36,14 +36,17 @@
                     OnContent="{DynamicResource enable}" />
             </cc:Card>
 
-            <cc:Card Title="{DynamicResource hideOnStartup}" Icon="&#xed1a;">
+            <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 30 0 0">
+            <cc:Card Title="{DynamicResource hideFlowLauncherWhenLoseFocus}" Margin="0 14 0 0">
                 <ui:ToggleSwitch
                     IsOn="{Binding Settings.HideWhenDeactivated}"
                     OffContent="{DynamicResource disable}"
@@ -57,7 +60,7 @@
                     OnContent="{DynamicResource enable}" />
             </cc:Card>
 
-            <cc:CardGroup Margin="0 30 0 0">
+            <cc:CardGroup Margin="0 14 0 0">
                 <cc:Card Title="{DynamicResource SearchWindowPosition}" Icon="&#xe7f4;">
                     <StackPanel Orientation="Horizontal">
                         <ComboBox
@@ -121,6 +124,7 @@
 
             <cc:Card
                 Title="{DynamicResource ignoreHotkeysOnFullscreen}"
+                Margin="0 14 0 0"
                 Icon="&#xe7fc;"
                 Sub="{DynamicResource ignoreHotkeysOnFullscreenToolTip}">
                 <ui:ToggleSwitch
@@ -131,7 +135,7 @@
 
             <cc:Card
                 Title="{DynamicResource AlwaysPreview}"
-                Margin="0 30 0 0"
+                Margin="0 14 0 0"
                 Icon="&#xe8a1;"
                 Sub="{DynamicResource AlwaysPreviewToolTip}">
                 <ui:ToggleSwitch
@@ -143,7 +147,7 @@
 
             <cc:Card
                 Title="{DynamicResource autoUpdates}"
-                Margin="0 30 0 0"
+                Margin="0 14 0 0"
                 Icon="&#xecc5;">
                 <ui:ToggleSwitch
                     IsOn="{Binding AutoUpdates}"
@@ -161,7 +165,7 @@
                     OnContent="{DynamicResource enable}" />
             </cc:Card>
 
-            <cc:CardGroup Margin="0 30 0 0">
+            <cc:CardGroup Margin="0 14 0 0">
                 <cc:Card Title="{DynamicResource querySearchPrecision}" Sub="{DynamicResource querySearchPrecisionToolTip}">
                     <ComboBox
                         MaxWidth="200"
@@ -182,7 +186,7 @@
 
             <cc:Card
                 Title="{DynamicResource defaultFileManager}"
-                Margin="0 30 0 0"
+                Margin="0 14 0 0"
                 Icon="&#xe838;"
                 Sub="{DynamicResource defaultFileManagerToolTip}">
                 <Button
@@ -205,7 +209,7 @@
                     Content="{Binding Settings.CustomBrowser.Name}" />
             </cc:Card>
 
-            <cc:Card Title="{DynamicResource pythonFilePath}" Margin="0 30 0 0">
+            <cc:Card Title="{DynamicResource pythonFilePath}" Margin="0 14 0 0">
                 <StackPanel Orientation="Horizontal">
                     <TextBox
                         Width="300"
@@ -235,7 +239,7 @@
 
             <cc:Card
                 Title="{DynamicResource typingStartEn}"
-                Margin="0 30 0 0"
+                Margin="0 14 0 0"
                 Icon="&#xe8d3;"
                 Sub="{DynamicResource typingStartEnTooltip}">
                 <ui:ToggleSwitch
@@ -257,7 +261,7 @@
 
             <cc:Card
                 Title="{DynamicResource language}"
-                Margin="0 30 0 0"
+                Margin="0 14 0 0"
                 Icon="&#xf2b7;">
                 <ComboBox
                     MaxWidth="200"
diff --git a/Flow.Launcher/SettingPages/Views/SettingsPaneTheme.xaml b/Flow.Launcher/SettingPages/Views/SettingsPaneTheme.xaml
index 08b49e745..03f65e2d1 100644
--- a/Flow.Launcher/SettingPages/Views/SettingsPaneTheme.xaml
+++ b/Flow.Launcher/SettingPages/Views/SettingsPaneTheme.xaml
@@ -368,7 +368,7 @@
             <!--  Drop shadow effect  -->
             <cc:Card
                 Title="{DynamicResource queryWindowShadowEffect}"
-                Margin="0 4 0 0"
+                Margin="0 8 0 0"
                 Icon="&#xeb91;"
                 Sub="{DynamicResource shadowEffectCPUUsage}">
                 <ui:ToggleSwitch
@@ -515,7 +515,7 @@
             <!--  Fonts and icons  -->
             <cc:Card
                 Title="{DynamicResource useGlyphUI}"
-                Margin="0 6 0 0"
+                Margin="0 14 0 0"
                 Icon="&#xf6b8;"
                 Sub="{DynamicResource useGlyphUIEffect}">
                 <ui:ToggleSwitch
@@ -525,7 +525,7 @@
             </cc:Card>
 
             <!--  Time and date  -->
-            <cc:CardGroup Margin="0 11 0 0">
+            <cc:CardGroup Margin="0 14 0 0">
                 <cc:Card Title="{DynamicResource Clock}" Icon="&#xec92;">
                     <StackPanel Orientation="Horizontal">
                         <TextBlock
@@ -570,7 +570,7 @@
             </cc:CardGroup>
 
             <!--  Animation  -->
-            <cc:CardGroup Margin="0 11 0 0">
+            <cc:CardGroup Margin="0 14 0 0">
                 <cc:Card
                     Title="{DynamicResource Animation}"
                     Icon="&#xedb5;"
@@ -607,7 +607,7 @@
             </cc:CardGroup>
 
             <!--  SFX  -->
-            <cc:CardGroup Margin="0 11 0 0">
+            <cc:CardGroup Margin="0 14 0 0">
                 <cc:Card
                     Title="{DynamicResource SoundEffect}"
                     Icon="&#xe7f5;"
@@ -678,7 +678,7 @@
             <!--  Settings color scheme  -->
             <cc:Card
                 Title="{DynamicResource ColorScheme}"
-                Margin="0 11 0 0"
+                Margin="0 14 0 0"
                 Icon="&#xe793;">
                 <ComboBox
                     MinWidth="180"
@@ -691,7 +691,10 @@
             </cc:Card>
 
             <!--  Theme folder  -->
-            <cc:Card Title="{DynamicResource ThemeFolder}" Icon="&#xe838;">
+            <cc:Card
+                Title="{DynamicResource ThemeFolder}"
+                Margin="0 14 0 0"
+                Icon="&#xe838;">
                 <Button
                     MinWidth="180"
                     Command="{Binding OpenThemesFolderCommand}"