diff --git a/Core/Other/Settings/TabSettingsAdvanced.Designer.cs b/Core/Other/Settings/TabSettingsAdvanced.Designer.cs
index d2abcde8..b73f3661 100644
--- a/Core/Other/Settings/TabSettingsAdvanced.Designer.cs
+++ b/Core/Other/Settings/TabSettingsAdvanced.Designer.cs
@@ -56,7 +56,6 @@ private void InitializeComponent() {
             this.btnClearCache.Size = new System.Drawing.Size(144, 23);
             this.btnClearCache.TabIndex = 1;
             this.btnClearCache.Text = "Clear Cache (calculating)";
-            this.toolTip.SetToolTip(this.btnClearCache, "Clearing cache will free up space taken by downloaded images and other resources.");
             this.btnClearCache.UseVisualStyleBackColor = true;
             // 
             // checkHardwareAcceleration
@@ -68,7 +67,6 @@ private void InitializeComponent() {
             this.checkHardwareAcceleration.Size = new System.Drawing.Size(134, 17);
             this.checkHardwareAcceleration.TabIndex = 0;
             this.checkHardwareAcceleration.Text = "Hardware Acceleration";
-            this.toolTip.SetToolTip(this.checkHardwareAcceleration, "Uses graphics card to improve performance. Disable if you experience\r\nvisual glitches. This option will not be exported in a profile.");
             this.checkHardwareAcceleration.UseVisualStyleBackColor = true;
             // 
             // btnEditCefArgs
@@ -79,7 +77,6 @@ private void InitializeComponent() {
             this.btnEditCefArgs.Size = new System.Drawing.Size(144, 23);
             this.btnEditCefArgs.TabIndex = 0;
             this.btnEditCefArgs.Text = "Edit CEF Arguments";
-            this.toolTip.SetToolTip(this.btnEditCefArgs, "Set custom command line arguments for Chromium Embedded Framework.");
             this.btnEditCefArgs.UseVisualStyleBackColor = true;
             // 
             // btnEditCSS
@@ -89,7 +86,6 @@ private void InitializeComponent() {
             this.btnEditCSS.Size = new System.Drawing.Size(144, 23);
             this.btnEditCSS.TabIndex = 1;
             this.btnEditCSS.Text = "Edit CSS";
-            this.toolTip.SetToolTip(this.btnEditCSS, "Set custom CSS for browser and notification windows.");
             this.btnEditCSS.UseVisualStyleBackColor = true;
             // 
             // btnRestartArgs
@@ -99,7 +95,6 @@ private void InitializeComponent() {
             this.btnRestartArgs.Size = new System.Drawing.Size(144, 23);
             this.btnRestartArgs.TabIndex = 3;
             this.btnRestartArgs.Text = "Restart with Arguments";
-            this.toolTip.SetToolTip(this.btnRestartArgs, "Restarts the program with customizable\r\ncommand line arguments.");
             this.btnRestartArgs.UseVisualStyleBackColor = true;
             // 
             // btnRestart
@@ -109,7 +104,6 @@ private void InitializeComponent() {
             this.btnRestart.Size = new System.Drawing.Size(144, 23);
             this.btnRestart.TabIndex = 2;
             this.btnRestart.Text = "Restart the Program";
-            this.toolTip.SetToolTip(this.btnRestart, "Restarts the program using the same command\r\nline arguments that were used at launch.");
             this.btnRestart.UseVisualStyleBackColor = true;
             // 
             // btnOpenAppFolder
@@ -120,7 +114,6 @@ private void InitializeComponent() {
             this.btnOpenAppFolder.Size = new System.Drawing.Size(144, 23);
             this.btnOpenAppFolder.TabIndex = 0;
             this.btnOpenAppFolder.Text = "Open Program Folder";
-            this.toolTip.SetToolTip(this.btnOpenAppFolder, "Opens the folder where the app is located.");
             this.btnOpenAppFolder.UseVisualStyleBackColor = true;
             // 
             // btnOpenDataFolder
@@ -131,7 +124,6 @@ private void InitializeComponent() {
             this.btnOpenDataFolder.Size = new System.Drawing.Size(144, 23);
             this.btnOpenDataFolder.TabIndex = 1;
             this.btnOpenDataFolder.Text = "Open Data Folder";
-            this.toolTip.SetToolTip(this.btnOpenDataFolder, "Opens the folder where your profile data is located.");
             this.btnOpenDataFolder.UseVisualStyleBackColor = true;
             // 
             // numClearCacheThreshold
@@ -155,7 +147,6 @@ private void InitializeComponent() {
             this.checkClearCacheAuto.Size = new System.Drawing.Size(215, 17);
             this.checkClearCacheAuto.TabIndex = 3;
             this.checkClearCacheAuto.Text = "Clear Cache Automatically When Above";
-            this.toolTip.SetToolTip(this.checkClearCacheAuto, "Automatically clears cache when its size exceeds the set threshold. Note that cache can only be cleared when closing TweetDuck.");
             this.checkClearCacheAuto.UseVisualStyleBackColor = true;
             // 
             // labelApp
diff --git a/Core/Other/Settings/TabSettingsAdvanced.cs b/Core/Other/Settings/TabSettingsAdvanced.cs
index 150439af..f729cd9b 100644
--- a/Core/Other/Settings/TabSettingsAdvanced.cs
+++ b/Core/Other/Settings/TabSettingsAdvanced.cs
@@ -17,6 +17,19 @@ public TabSettingsAdvanced(Action<string> reinjectBrowserCSS){
             InitializeComponent();
 
             this.reinjectBrowserCSS = reinjectBrowserCSS;
+            
+            toolTip.SetToolTip(btnOpenAppFolder, "Opens the folder where the app is located.");
+            toolTip.SetToolTip(btnOpenDataFolder, "Opens the folder where your profile data is located.");
+            toolTip.SetToolTip(btnRestart, "Restarts the program using the same command\r\nline arguments that were used at launch.");
+            toolTip.SetToolTip(btnRestartArgs, "Restarts the program with customizable\r\ncommand line arguments.");
+
+            toolTip.SetToolTip(checkHardwareAcceleration, "Uses graphics card to improve performance. Disable if you experience\r\nvisual glitches. This option will not be exported in a profile.");
+
+            toolTip.SetToolTip(btnClearCache, "Clearing cache will free up space taken by downloaded images and other resources.");
+            toolTip.SetToolTip(checkClearCacheAuto, "Automatically clears cache when its size exceeds the set threshold. Note that cache can only be cleared when closing TweetDuck.");
+
+            toolTip.SetToolTip(btnEditCefArgs, "Set custom command line arguments for Chromium Embedded Framework.");
+            toolTip.SetToolTip(btnEditCSS, "Set custom CSS for browser and notification windows.");
 
             if (SystemConfig.IsHardwareAccelerationSupported){
                 checkHardwareAcceleration.Checked = SysConfig.HardwareAcceleration;
@@ -37,6 +50,11 @@ public TabSettingsAdvanced(Action<string> reinjectBrowserCSS){
         }
 
         public override void OnReady(){
+            btnOpenAppFolder.Click += btnOpenAppFolder_Click;
+            btnOpenDataFolder.Click += btnOpenDataFolder_Click;
+            btnRestart.Click += btnRestart_Click;
+            btnRestartArgs.Click += btnRestartArgs_Click;
+
             checkHardwareAcceleration.CheckedChanged += checkHardwareAcceleration_CheckedChanged;
 
             btnClearCache.Click += btnClearCache_Click;
@@ -44,11 +62,6 @@ public override void OnReady(){
             
             btnEditCefArgs.Click += btnEditCefArgs_Click;
             btnEditCSS.Click += btnEditCSS_Click;
-            
-            btnOpenAppFolder.Click += btnOpenAppFolder_Click;
-            btnOpenDataFolder.Click += btnOpenDataFolder_Click;
-            btnRestart.Click += btnRestart_Click;
-            btnRestartArgs.Click += btnRestartArgs_Click;
         }
 
         public override void OnClosing(){
diff --git a/Core/Other/Settings/TabSettingsGeneral.Designer.cs b/Core/Other/Settings/TabSettingsGeneral.Designer.cs
index 7e58079b..3ca82786 100644
--- a/Core/Other/Settings/TabSettingsGeneral.Designer.cs
+++ b/Core/Other/Settings/TabSettingsGeneral.Designer.cs
@@ -55,7 +55,6 @@ private void InitializeComponent() {
             this.checkExpandLinks.Size = new System.Drawing.Size(166, 17);
             this.checkExpandLinks.TabIndex = 0;
             this.checkExpandLinks.Text = "Expand Links When Hovered";
-            this.toolTip.SetToolTip(this.checkExpandLinks, "Expands links inside the tweets. If disabled,\r\nthe full links show up in a tooltip instead.");
             this.checkExpandLinks.UseVisualStyleBackColor = true;
             // 
             // checkSpellCheck
@@ -67,7 +66,6 @@ private void InitializeComponent() {
             this.checkSpellCheck.Size = new System.Drawing.Size(119, 17);
             this.checkSpellCheck.TabIndex = 5;
             this.checkSpellCheck.Text = "Enable Spell Check";
-            this.toolTip.SetToolTip(this.checkSpellCheck, "Underlines words that are spelled incorrectly.");
             this.checkSpellCheck.UseVisualStyleBackColor = true;
             // 
             // checkUpdateNotifications
@@ -79,7 +77,6 @@ private void InitializeComponent() {
             this.checkUpdateNotifications.Size = new System.Drawing.Size(165, 17);
             this.checkUpdateNotifications.TabIndex = 0;
             this.checkUpdateNotifications.Text = "Check Updates Automatically";
-            this.toolTip.SetToolTip(this.checkUpdateNotifications, "Checks for updates every hour.\r\nIf an update is dismissed, it will not appear again.");
             this.checkUpdateNotifications.UseVisualStyleBackColor = true;
             // 
             // btnCheckUpdates
@@ -90,7 +87,6 @@ private void InitializeComponent() {
             this.btnCheckUpdates.Size = new System.Drawing.Size(144, 23);
             this.btnCheckUpdates.TabIndex = 1;
             this.btnCheckUpdates.Text = "Check Updates Now";
-            this.toolTip.SetToolTip(this.btnCheckUpdates, "Forces an update check, even for updates that had been dismissed.");
             this.btnCheckUpdates.UseVisualStyleBackColor = true;
             // 
             // labelZoomValue
@@ -103,7 +99,6 @@ private void InitializeComponent() {
             this.labelZoomValue.TabIndex = 8;
             this.labelZoomValue.Text = "100%";
             this.labelZoomValue.TextAlign = System.Drawing.ContentAlignment.TopRight;
-            this.toolTip.SetToolTip(this.labelZoomValue, "Changes the zoom level.\r\nAlso affects notifications and screenshots.");
             // 
             // checkSwitchAccountSelectors
             // 
@@ -114,7 +109,6 @@ private void InitializeComponent() {
             this.checkSwitchAccountSelectors.Size = new System.Drawing.Size(172, 17);
             this.checkSwitchAccountSelectors.TabIndex = 1;
             this.checkSwitchAccountSelectors.Text = "Shift Selects Multiple Accounts";
-            this.toolTip.SetToolTip(this.checkSwitchAccountSelectors, "When (re)tweeting, click to select a single account or hold Shift to\r\nselect multiple accounts, instead of TweetDeck\'s default behavior.");
             this.checkSwitchAccountSelectors.UseVisualStyleBackColor = true;
             // 
             // checkBestImageQuality
@@ -126,7 +120,6 @@ private void InitializeComponent() {
             this.checkBestImageQuality.Size = new System.Drawing.Size(114, 17);
             this.checkBestImageQuality.TabIndex = 3;
             this.checkBestImageQuality.Text = "Best Image Quality";
-            this.toolTip.SetToolTip(this.checkBestImageQuality, "When right-clicking a tweet image, the context menu options\r\nwill use links to the original image size (:orig in the URL).");
             this.checkBestImageQuality.UseVisualStyleBackColor = true;
             // 
             // checkOpenSearchInFirstColumn
@@ -138,7 +131,6 @@ private void InitializeComponent() {
             this.checkOpenSearchInFirstColumn.Size = new System.Drawing.Size(219, 17);
             this.checkOpenSearchInFirstColumn.TabIndex = 2;
             this.checkOpenSearchInFirstColumn.Text = "Add Search Columns Before First Column";
-            this.toolTip.SetToolTip(this.checkOpenSearchInFirstColumn, "By default, TweetDeck adds Search columns at the end.\r\nThis option makes them appear before the first column instead.");
             this.checkOpenSearchInFirstColumn.UseVisualStyleBackColor = true;
             // 
             // trackBarZoom
@@ -231,7 +223,6 @@ private void InitializeComponent() {
             this.checkAnimatedAvatars.Size = new System.Drawing.Size(145, 17);
             this.checkAnimatedAvatars.TabIndex = 4;
             this.checkAnimatedAvatars.Text = "Enable Animated Avatars";
-            this.toolTip.SetToolTip(this.checkAnimatedAvatars, "Some old Twitter avatars could be uploaded as animated GIFs.");
             this.checkAnimatedAvatars.UseVisualStyleBackColor = true;
             // 
             // TabSettingsGeneral
diff --git a/Core/Other/Settings/TabSettingsGeneral.cs b/Core/Other/Settings/TabSettingsGeneral.cs
index 5654c445..c8088c99 100644
--- a/Core/Other/Settings/TabSettingsGeneral.cs
+++ b/Core/Other/Settings/TabSettingsGeneral.cs
@@ -18,7 +18,19 @@ public TabSettingsGeneral(FormBrowser browser, UpdateHandler updates){
             this.updates.CheckFinished += updates_CheckFinished;
             Disposed += (sender, args) => this.updates.CheckFinished -= updates_CheckFinished;
             
+            toolTip.SetToolTip(checkExpandLinks, "Expands links inside the tweets. If disabled,\r\nthe full links show up in a tooltip instead.");
+            toolTip.SetToolTip(checkSwitchAccountSelectors, "When (re)tweeting, click to select a single account or hold Shift to\r\nselect multiple accounts, instead of TweetDeck\'s default behavior.");
+            toolTip.SetToolTip(checkOpenSearchInFirstColumn, "By default, TweetDeck adds Search columns at the end.\r\nThis option makes them appear before the first column instead.");
+            toolTip.SetToolTip(checkBestImageQuality, "When right-clicking a tweet image, the context menu options\r\nwill use links to the original image size (:orig in the URL).");
+            toolTip.SetToolTip(checkAnimatedAvatars, "Some old Twitter avatars could be uploaded as animated GIFs.");
+            toolTip.SetToolTip(checkSpellCheck, "Underlines words that are spelled incorrectly.");
+
+            toolTip.SetToolTip(labelZoomValue, "Changes the zoom level.\r\nAlso affects notifications and screenshots.");
             toolTip.SetToolTip(trackBarZoom, toolTip.GetToolTip(labelZoomValue));
+
+            toolTip.SetToolTip(checkUpdateNotifications, "Checks for updates every hour.\r\nIf an update is dismissed, it will not appear again.");
+            toolTip.SetToolTip(btnCheckUpdates, "Forces an update check, even for updates that had been dismissed.");
+
             trackBarZoom.SetValueSafe(Config.ZoomLevel);
             labelZoomValue.Text = trackBarZoom.Value+"%";
 
diff --git a/Core/Other/Settings/TabSettingsNotifications.Designer.cs b/Core/Other/Settings/TabSettingsNotifications.Designer.cs
index 4adf885a..41bd0e89 100644
--- a/Core/Other/Settings/TabSettingsNotifications.Designer.cs
+++ b/Core/Other/Settings/TabSettingsNotifications.Designer.cs
@@ -125,7 +125,6 @@ private void InitializeComponent() {
             this.radioLocCustom.TabIndex = 4;
             this.radioLocCustom.TabStop = true;
             this.radioLocCustom.Text = "Custom";
-            this.toolTip.SetToolTip(this.radioLocCustom, "Drag the example notification window to the desired location.");
             this.radioLocCustom.UseVisualStyleBackColor = true;
             // 
             // radioLocBR
@@ -257,7 +256,6 @@ private void InitializeComponent() {
             this.labelDurationValue.TabIndex = 4;
             this.labelDurationValue.Text = "0 ms/c";
             this.labelDurationValue.TextAlign = System.Drawing.ContentAlignment.TopRight;
-            this.toolTip.SetToolTip(this.labelDurationValue, "Milliseconds per character.");
             // 
             // trackBarDuration
             // 
@@ -280,7 +278,6 @@ private void InitializeComponent() {
             this.checkSkipOnLinkClick.Size = new System.Drawing.Size(113, 17);
             this.checkSkipOnLinkClick.TabIndex = 2;
             this.checkSkipOnLinkClick.Text = "Skip On Link Click";
-            this.toolTip.SetToolTip(this.checkSkipOnLinkClick, "Skips current notification when a link\r\ninside the notification is clicked.");
             this.checkSkipOnLinkClick.UseVisualStyleBackColor = true;
             // 
             // checkColumnName
@@ -292,7 +289,6 @@ private void InitializeComponent() {
             this.checkColumnName.Size = new System.Drawing.Size(129, 17);
             this.checkColumnName.TabIndex = 0;
             this.checkColumnName.Text = "Display Column Name";
-            this.toolTip.SetToolTip(this.checkColumnName, "Shows column name each notification originated\r\nfrom in the notification window title.");
             this.checkColumnName.UseVisualStyleBackColor = true;
             // 
             // labelIdlePause
@@ -314,7 +310,6 @@ private void InitializeComponent() {
             this.comboBoxIdlePause.Name = "comboBoxIdlePause";
             this.comboBoxIdlePause.Size = new System.Drawing.Size(144, 21);
             this.comboBoxIdlePause.TabIndex = 5;
-            this.toolTip.SetToolTip(this.comboBoxIdlePause, "Pauses new notifications after going idle for a set amount of time.");
             // 
             // checkNonIntrusive
             // 
@@ -325,7 +320,6 @@ private void InitializeComponent() {
             this.checkNonIntrusive.Size = new System.Drawing.Size(128, 17);
             this.checkNonIntrusive.TabIndex = 3;
             this.checkNonIntrusive.Text = "Non-Intrusive Popups";
-            this.toolTip.SetToolTip(this.checkNonIntrusive, "When not idle and the cursor is within the notification window area,\r\nit will be delayed until the cursor moves away to prevent accidental clicks.");
             this.checkNonIntrusive.UseVisualStyleBackColor = true;
             // 
             // checkTimerCountDown
@@ -337,7 +331,6 @@ private void InitializeComponent() {
             this.checkTimerCountDown.Size = new System.Drawing.Size(119, 17);
             this.checkTimerCountDown.TabIndex = 1;
             this.checkTimerCountDown.Text = "Timer Counts Down";
-            this.toolTip.SetToolTip(this.checkTimerCountDown, "The notification timer counts down instead of up.");
             this.checkTimerCountDown.UseVisualStyleBackColor = true;
             // 
             // checkNotificationTimer
@@ -360,19 +353,17 @@ private void InitializeComponent() {
             this.radioSizeAuto.TabIndex = 0;
             this.radioSizeAuto.TabStop = true;
             this.radioSizeAuto.Text = "Auto";
-            this.toolTip.SetToolTip(this.radioSizeAuto, "Notification size is based on the font size and browser zoom level.");
             this.radioSizeAuto.UseVisualStyleBackColor = true;
             // 
             // radioSizeCustom
             // 
-            this.radioSizeCustom.Location = new System.Drawing.Point(106, 4);
+            this.radioSizeCustom.Location = new System.Drawing.Point(105, 4);
             this.radioSizeCustom.Margin = new System.Windows.Forms.Padding(5, 4, 3, 3);
             this.radioSizeCustom.Name = "radioSizeCustom";
             this.radioSizeCustom.Size = new System.Drawing.Size(92, 17);
             this.radioSizeCustom.TabIndex = 1;
             this.radioSizeCustom.TabStop = true;
             this.radioSizeCustom.Text = "Custom";
-            this.toolTip.SetToolTip(this.radioSizeCustom, "Resize the example notification window to the desired size.");
             this.radioSizeCustom.UseVisualStyleBackColor = true;
             // 
             // labelGeneral
@@ -540,7 +531,6 @@ private void InitializeComponent() {
             this.checkMediaPreviews.Size = new System.Drawing.Size(131, 17);
             this.checkMediaPreviews.TabIndex = 1;
             this.checkMediaPreviews.Text = "Show Media Previews";
-            this.toolTip.SetToolTip(this.checkMediaPreviews, "Shows image and video thumbnails in the notification window.");
             this.checkMediaPreviews.UseVisualStyleBackColor = true;
             // 
             // TabSettingsNotifications
diff --git a/Core/Other/Settings/TabSettingsNotifications.cs b/Core/Other/Settings/TabSettingsNotifications.cs
index f45019a5..d7866732 100644
--- a/Core/Other/Settings/TabSettingsNotifications.cs
+++ b/Core/Other/Settings/TabSettingsNotifications.cs
@@ -25,6 +25,41 @@ public TabSettingsNotifications(FormNotificationExample notification){
 
             this.notification.Activated += notification_Activated;
             this.notification.Show();
+            
+            toolTip.SetToolTip(checkColumnName, "Shows column name each notification originated\r\nfrom in the notification window title.");
+            toolTip.SetToolTip(checkMediaPreviews, "Shows image and video thumbnails in the notification window.");
+            toolTip.SetToolTip(checkSkipOnLinkClick, "Skips current notification when a link\r\ninside the notification is clicked.");
+            toolTip.SetToolTip(checkNonIntrusive, "When not idle and the cursor is within the notification window area,\r\nit will be delayed until the cursor moves away to prevent accidental clicks.");
+
+            toolTip.SetToolTip(comboBoxIdlePause, "Pauses new notifications after going idle for a set amount of time.");
+            
+            toolTip.SetToolTip(checkTimerCountDown, "The notification timer counts down instead of up.");
+            toolTip.SetToolTip(labelDurationValue, "Milliseconds per character.");
+            toolTip.SetToolTip(trackBarDuration, toolTip.GetToolTip(labelDurationValue));
+
+            toolTip.SetToolTip(radioLocCustom, "Drag the example notification window to the desired location.");
+            
+            toolTip.SetToolTip(radioSizeAuto, "Notification size is based on the font size and browser zoom level.");
+            toolTip.SetToolTip(radioSizeCustom, "Resize the example notification window to the desired size.");
+            
+            checkColumnName.Checked = Config.DisplayNotificationColumn;
+            checkMediaPreviews.Checked = Config.NotificationMediaPreviews;
+            checkSkipOnLinkClick.Checked = Config.NotificationSkipOnLinkClick;
+            checkNonIntrusive.Checked = Config.NotificationNonIntrusiveMode;
+
+            comboBoxIdlePause.Items.Add("Disabled");
+            comboBoxIdlePause.Items.Add("30 seconds");
+            comboBoxIdlePause.Items.Add("1 minute");
+            comboBoxIdlePause.Items.Add("2 minutes");
+            comboBoxIdlePause.Items.Add("5 minutes");
+            comboBoxIdlePause.SelectedIndex = Math.Max(0, Array.FindIndex(IdlePauseSeconds, val => val == Config.NotificationIdlePauseSeconds));
+
+            checkNotificationTimer.Checked = Config.DisplayNotificationTimer;
+            checkTimerCountDown.Enabled = checkNotificationTimer.Checked;
+            checkTimerCountDown.Checked = Config.NotificationTimerCountDown;
+            
+            trackBarDuration.SetValueSafe(Config.NotificationDurationValue);
+            labelDurationValue.Text = Config.NotificationDurationValue+" ms/c";
 
             switch(Config.NotificationPosition){
                 case TweetNotification.Position.TopLeft: radioLocTL.Checked = true; break;
@@ -35,23 +70,6 @@ public TabSettingsNotifications(FormNotificationExample notification){
             }
 
             comboBoxDisplay.Enabled = trackBarEdgeDistance.Enabled = !radioLocCustom.Checked;
-
-            switch(Config.NotificationSize){
-                case TweetNotification.Size.Auto: radioSizeAuto.Checked = true; break;
-                case TweetNotification.Size.Custom: radioSizeCustom.Checked = true; break;
-            }
-            
-            toolTip.SetToolTip(trackBarDuration, toolTip.GetToolTip(labelDurationValue));
-            trackBarDuration.SetValueSafe(Config.NotificationDurationValue);
-            labelDurationValue.Text = Config.NotificationDurationValue+" ms/c";
-
-            comboBoxIdlePause.Items.Add("Disabled");
-            comboBoxIdlePause.Items.Add("30 seconds");
-            comboBoxIdlePause.Items.Add("1 minute");
-            comboBoxIdlePause.Items.Add("2 minutes");
-            comboBoxIdlePause.Items.Add("5 minutes");
-            comboBoxIdlePause.SelectedIndex = Math.Max(0, Array.FindIndex(IdlePauseSeconds, val => val == Config.NotificationIdlePauseSeconds));
-
             comboBoxDisplay.Items.Add("(Same as TweetDuck)");
 
             foreach(Screen screen in Screen.AllScreens){
@@ -59,51 +77,50 @@ public TabSettingsNotifications(FormNotificationExample notification){
             }
 
             comboBoxDisplay.SelectedIndex = Math.Min(comboBoxDisplay.Items.Count-1, Config.NotificationDisplay);
-            
-            checkColumnName.Checked = Config.DisplayNotificationColumn;
-            checkNotificationTimer.Checked = Config.DisplayNotificationTimer;
-            checkTimerCountDown.Enabled = checkNotificationTimer.Checked;
-            checkTimerCountDown.Checked = Config.NotificationTimerCountDown;
-            checkMediaPreviews.Checked = Config.NotificationMediaPreviews;
-            checkSkipOnLinkClick.Checked = Config.NotificationSkipOnLinkClick;
-            checkNonIntrusive.Checked = Config.NotificationNonIntrusiveMode;
-
-            trackBarScrollSpeed.SetValueSafe(Config.NotificationScrollSpeed);
-            labelScrollSpeedValue.Text = trackBarScrollSpeed.Value+"%";
 
             trackBarEdgeDistance.SetValueSafe(Config.NotificationEdgeDistance);
             labelEdgeDistanceValue.Text = trackBarEdgeDistance.Value+" px";
+
+            switch(Config.NotificationSize){
+                case TweetNotification.Size.Auto: radioSizeAuto.Checked = true; break;
+                case TweetNotification.Size.Custom: radioSizeCustom.Checked = true; break;
+            }
+
+            trackBarScrollSpeed.SetValueSafe(Config.NotificationScrollSpeed);
+            labelScrollSpeedValue.Text = trackBarScrollSpeed.Value+"%";
             
             Disposed += (sender, args) => this.notification.Dispose();
         }
 
         public override void OnReady(){
-            radioLocTL.CheckedChanged += radioLoc_CheckedChanged;
-            radioLocTR.CheckedChanged += radioLoc_CheckedChanged;
-            radioLocBL.CheckedChanged += radioLoc_CheckedChanged;
-            radioLocBR.CheckedChanged += radioLoc_CheckedChanged;
-            radioLocCustom.Click += radioLocCustom_Click;
+            checkColumnName.CheckedChanged += checkColumnName_CheckedChanged;
+            checkMediaPreviews.CheckedChanged += checkMediaPreviews_CheckedChanged;
+            checkSkipOnLinkClick.CheckedChanged += checkSkipOnLinkClick_CheckedChanged;
+            checkNonIntrusive.CheckedChanged += checkNonIntrusive_CheckedChanged;
 
-            radioSizeAuto.CheckedChanged += radioSize_CheckedChanged;
-            radioSizeCustom.Click += radioSizeCustom_Click;
+            comboBoxIdlePause.SelectedValueChanged += comboBoxIdlePause_SelectedValueChanged;
+
+            checkNotificationTimer.CheckedChanged += checkNotificationTimer_CheckedChanged;
+            checkTimerCountDown.CheckedChanged += checkTimerCountDown_CheckedChanged;
 
             trackBarDuration.ValueChanged += trackBarDuration_ValueChanged;
             btnDurationShort.Click += btnDurationShort_Click;
             btnDurationMedium.Click += btnDurationMedium_Click;
             btnDurationLong.Click += btnDurationLong_Click;
 
-            checkColumnName.CheckedChanged += checkColumnName_CheckedChanged;
-            checkNotificationTimer.CheckedChanged += checkNotificationTimer_CheckedChanged;
-            checkTimerCountDown.CheckedChanged += checkTimerCountDown_CheckedChanged;
-            checkMediaPreviews.CheckedChanged += checkMediaPreviews_CheckedChanged;
-            checkSkipOnLinkClick.CheckedChanged += checkSkipOnLinkClick_CheckedChanged;
-            checkNonIntrusive.CheckedChanged += checkNonIntrusive_CheckedChanged;
-
-            comboBoxIdlePause.SelectedValueChanged += comboBoxIdlePause_SelectedValueChanged;
-            trackBarScrollSpeed.ValueChanged += trackBarScrollSpeed_ValueChanged;
+            radioLocTL.CheckedChanged += radioLoc_CheckedChanged;
+            radioLocTR.CheckedChanged += radioLoc_CheckedChanged;
+            radioLocBL.CheckedChanged += radioLoc_CheckedChanged;
+            radioLocBR.CheckedChanged += radioLoc_CheckedChanged;
+            radioLocCustom.Click += radioLocCustom_Click;
 
             comboBoxDisplay.SelectedValueChanged += comboBoxDisplay_SelectedValueChanged;
             trackBarEdgeDistance.ValueChanged += trackBarEdgeDistance_ValueChanged;
+
+            radioSizeAuto.CheckedChanged += radioSize_CheckedChanged;
+            radioSizeCustom.Click += radioSizeCustom_Click;
+
+            trackBarScrollSpeed.ValueChanged += trackBarScrollSpeed_ValueChanged;
         }
 
         private void TabSettingsNotifications_ParentChanged(object sender, EventArgs e){
diff --git a/Core/Other/Settings/TabSettingsSounds.Designer.cs b/Core/Other/Settings/TabSettingsSounds.Designer.cs
index 8f3d4582..f81f5379 100644
--- a/Core/Other/Settings/TabSettingsSounds.Designer.cs
+++ b/Core/Other/Settings/TabSettingsSounds.Designer.cs
@@ -46,7 +46,6 @@ private void InitializeComponent() {
             this.tbCustomSound.Name = "tbCustomSound";
             this.tbCustomSound.Size = new System.Drawing.Size(316, 20);
             this.tbCustomSound.TabIndex = 0;
-            this.toolTip.SetToolTip(this.tbCustomSound, "When empty, the default TweetDeck sound notification is used.");
             // 
             // labelVolumeValue
             // 
diff --git a/Core/Other/Settings/TabSettingsSounds.cs b/Core/Other/Settings/TabSettingsSounds.cs
index e67c2517..8cb3c45b 100644
--- a/Core/Other/Settings/TabSettingsSounds.cs
+++ b/Core/Other/Settings/TabSettingsSounds.cs
@@ -16,17 +16,18 @@ public TabSettingsSounds(){
 
             soundNotification = new SoundNotification();
             soundNotification.PlaybackError += sound_PlaybackError;
+            Disposed += (sender, args) => soundNotification.Dispose();
             
             supportsChangingVolume = soundNotification.SetVolume(Config.NotificationSoundVolume);
 
+            toolTip.SetToolTip(tbCustomSound, "When empty, the default TweetDeck sound notification is used.");
+
             trackBarVolume.Enabled = supportsChangingVolume && !string.IsNullOrEmpty(Config.NotificationSoundPath);
             trackBarVolume.SetValueSafe(Config.NotificationSoundVolume);
             labelVolumeValue.Text = trackBarVolume.Value+"%";
 
             tbCustomSound.Text = Config.NotificationSoundPath;
             tbCustomSound_TextChanged(tbCustomSound, EventArgs.Empty);
-
-            Disposed += (sender, args) => soundNotification.Dispose();
         }
 
         public override void OnReady(){
diff --git a/Core/Other/Settings/TabSettingsTray.Designer.cs b/Core/Other/Settings/TabSettingsTray.Designer.cs
index 2e64abcb..348a6f2c 100644
--- a/Core/Other/Settings/TabSettingsTray.Designer.cs
+++ b/Core/Other/Settings/TabSettingsTray.Designer.cs
@@ -54,7 +54,6 @@ private void InitializeComponent() {
             this.checkTrayHighlight.Size = new System.Drawing.Size(103, 17);
             this.checkTrayHighlight.TabIndex = 2;
             this.checkTrayHighlight.Text = "Enable Highlight";
-            this.toolTip.SetToolTip(this.checkTrayHighlight, "Highlights the tray icon if there are new tweets.\r\nOnly works for columns with popup or audio notifications.\r\nThe icon resets when the main window is restored.");
             this.checkTrayHighlight.UseVisualStyleBackColor = true;
             // 
             // comboBoxTrayType
@@ -66,7 +65,6 @@ private void InitializeComponent() {
             this.comboBoxTrayType.Name = "comboBoxTrayType";
             this.comboBoxTrayType.Size = new System.Drawing.Size(144, 21);
             this.comboBoxTrayType.TabIndex = 0;
-            this.toolTip.SetToolTip(this.comboBoxTrayType, "Changes behavior of the Tray icon.\r\nRight-click the icon for an action menu.");
             // 
             // labelTrayIcon
             // 
diff --git a/Core/Other/Settings/TabSettingsTray.cs b/Core/Other/Settings/TabSettingsTray.cs
index 669bc1aa..b4c12088 100644
--- a/Core/Other/Settings/TabSettingsTray.cs
+++ b/Core/Other/Settings/TabSettingsTray.cs
@@ -5,6 +5,9 @@ sealed partial class TabSettingsTray : BaseTabSettings{
         public TabSettingsTray(){
             InitializeComponent();
             
+            toolTip.SetToolTip(comboBoxTrayType, "Changes behavior of the Tray icon.\r\nRight-click the icon for an action menu.");
+            toolTip.SetToolTip(checkTrayHighlight, "Highlights the tray icon if there are new tweets.\r\nOnly works for columns with popup or audio notifications.\r\nThe icon resets when the main window is restored.");
+            
             comboBoxTrayType.Items.Add("Disabled");
             comboBoxTrayType.Items.Add("Display Icon Only");
             comboBoxTrayType.Items.Add("Minimize to Tray");