diff --git a/DiscordChatExporter.Gui/Views/Dialogs/SettingsView.xaml b/DiscordChatExporter.Gui/Views/Dialogs/SettingsView.xaml
index e02e2575..b45400f0 100644
--- a/DiscordChatExporter.Gui/Views/Dialogs/SettingsView.xaml
+++ b/DiscordChatExporter.Gui/Views/Dialogs/SettingsView.xaml
@@ -23,10 +23,14 @@
             Margin="16,8"
             materialDesign:HintAssist.Hint="Date format"
             materialDesign:HintAssist.IsFloating="True"
-            Text="{Binding DateFormat}" />
+            Text="{Binding DateFormat}"
+            ToolTip="Format used when rendering dates (refer to .NET date format)" />
 
         <!--  Auto-updates  -->
-        <DockPanel LastChildFill="False">
+        <DockPanel
+            LastChildFill="False"
+            Background="Transparent"
+            ToolTip="Perform automatic updates on every launch">
             <TextBlock
                 Margin="16,8"
                 DockPanel.Dock="Left"
diff --git a/DiscordChatExporter.Gui/Views/RootView.xaml b/DiscordChatExporter.Gui/Views/RootView.xaml
index 3aba1897..5eef3c7a 100644
--- a/DiscordChatExporter.Gui/Views/RootView.xaml
+++ b/DiscordChatExporter.Gui/Views/RootView.xaml
@@ -94,7 +94,8 @@
                             Padding="4"
                             Command="{s:Action PopulateGuildsAndChannels}"
                             IsDefault="True"
-                            Style="{DynamicResource MaterialDesignFlatButton}">
+                            Style="{DynamicResource MaterialDesignFlatButton}"
+                            ToolTip="Pull available guilds and channels (Enter)">
                             <materialDesign:PackIcon
                                 Width="24"
                                 Height="24"
@@ -109,7 +110,8 @@
                     Margin="6"
                     Padding="4"
                     Command="{s:Action ShowSettings}"
-                    Style="{DynamicResource MaterialDesignFlatDarkButton}">
+                    Style="{DynamicResource MaterialDesignFlatDarkButton}"
+                    ToolTip="Settings">
                     <materialDesign:PackIcon
                         Width="24"
                         Height="24"