diff --git a/source/preferences.dfm b/source/preferences.dfm
index c5a98670..98225b80 100644
--- a/source/preferences.dfm
+++ b/source/preferences.dfm
@@ -3,8 +3,8 @@ object frmPreferences: TfrmPreferences
   Top = 163
   BorderIcons = [biSystemMenu]
   Caption = 'Preferences'
-  ClientHeight = 452
-  ClientWidth = 720
+  ClientHeight = 442
+  ClientWidth = 708
   Color = clBtnFace
   Constraints.MinHeight = 480
   Constraints.MinWidth = 600
@@ -18,14 +18,14 @@ object frmPreferences: TfrmPreferences
   OnCreate = FormCreate
   OnShow = FormShow
   DesignSize = (
-    720
-    452)
+    708
+    442)
   TextHeight = 14
   object pagecontrolMain: TPageControl
     Left = 8
     Top = 8
-    Width = 706
-    Height = 409
+    Width = 692
+    Height = 395
     ActivePage = tabMisc
     Anchors = [akLeft, akTop, akRight, akBottom]
     Images = MainForm.VirtualImageListMain
@@ -37,8 +37,8 @@ object frmPreferences: TfrmPreferences
       ImageIndex = 137
       ImageName = 'icons8-settings'
       DesignSize = (
-        698
-        380)
+        684
+        366)
       object lblMySQLBinaries: TLabel
         Left = 8
         Top = 177
@@ -68,7 +68,7 @@ object frmPreferences: TfrmPreferences
         Caption = 'GUI font: *'
       end
       object lblGUIFontSize: TLabel
-        Left = 662
+        Left = 648
         Top = 258
         Width = 12
         Height = 14
@@ -100,7 +100,7 @@ object frmPreferences: TfrmPreferences
       object chkAutoReconnect: TCheckBox
         Left = 220
         Top = 31
-        Width = 473
+        Width = 459
         Height = 17
         Anchors = [akLeft, akTop, akRight]
         Caption = 'Automatically reconnect to previously opened sessions on startup'
@@ -110,7 +110,7 @@ object frmPreferences: TfrmPreferences
       object chkRestoreLastDB: TCheckBox
         Left = 220
         Top = 54
-        Width = 473
+        Width = 459
         Height = 17
         Anchors = [akLeft, akTop, akRight]
         Caption = 'Restore last used database on startup'
@@ -154,7 +154,7 @@ object frmPreferences: TfrmPreferences
       object chkUpdateCheckBuilds: TCheckBox
         Left = 488
         Top = 77
-        Width = 205
+        Width = 191
         Height = 17
         Anchors = [akLeft, akTop, akRight]
         Caption = 'Also check for updated nightly builds'
@@ -165,7 +165,7 @@ object frmPreferences: TfrmPreferences
       object chkDoStatistics: TCheckBox
         Left = 220
         Top = 100
-        Width = 473
+        Width = 459
         Height = 17
         Hint = 
           'This option, if enabled, will cause HeidiSQL to ping heidisql.co' +
@@ -179,7 +179,7 @@ object frmPreferences: TfrmPreferences
       object chkAllowMultiInstances: TCheckBox
         Left = 220
         Top = 8
-        Width = 473
+        Width = 459
         Height = 17
         Anchors = [akLeft, akTop, akRight]
         Caption = 'Allow multiple application instances'
@@ -200,7 +200,7 @@ object frmPreferences: TfrmPreferences
       object editMySQLBinaries: TButtonedEdit
         Left = 220
         Top = 174
-        Width = 473
+        Width = 459
         Height = 22
         Anchors = [akLeft, akTop, akRight]
         Images = MainForm.VirtualImageListMain
@@ -217,7 +217,7 @@ object frmPreferences: TfrmPreferences
         Tag = 1
         Left = 220
         Top = 228
-        Width = 473
+        Width = 459
         Height = 22
         Style = csDropDownList
         Anchors = [akLeft, akTop, akRight]
@@ -227,7 +227,7 @@ object frmPreferences: TfrmPreferences
       object editCustomSnippetsDirectory: TButtonedEdit
         Left = 220
         Top = 201
-        Width = 473
+        Width = 459
         Height = 22
         Anchors = [akLeft, akTop, akRight]
         Images = MainForm.VirtualImageListMain
@@ -244,7 +244,7 @@ object frmPreferences: TfrmPreferences
         Tag = 1
         Left = 220
         Top = 255
-        Width = 360
+        Width = 346
         Height = 22
         Style = csDropDownList
         Anchors = [akLeft, akTop, akRight]
@@ -253,7 +253,7 @@ object frmPreferences: TfrmPreferences
       end
       object editGUIFontSize: TEdit
         Tag = 1
-        Left = 587
+        Left = 573
         Top = 255
         Width = 50
         Height = 22
@@ -264,7 +264,7 @@ object frmPreferences: TfrmPreferences
       end
       object updownGUIFontSize: TUpDown
         Tag = 1
-        Left = 637
+        Left = 623
         Top = 255
         Width = 16
         Height = 22
@@ -278,7 +278,7 @@ object frmPreferences: TfrmPreferences
       object chkWheelZoom: TCheckBox
         Left = 220
         Top = 123
-        Width = 473
+        Width = 459
         Height = 17
         Anchors = [akLeft, akTop, akRight]
         Caption = 'Use Ctrl+Mousewheel for zooming'
@@ -289,7 +289,7 @@ object frmPreferences: TfrmPreferences
         Tag = 1
         Left = 220
         Top = 282
-        Width = 360
+        Width = 346
         Height = 22
         Style = csDropDownList
         Anchors = [akLeft, akTop, akRight]
@@ -300,7 +300,7 @@ object frmPreferences: TfrmPreferences
       object comboIconPack: TComboBox
         Left = 220
         Top = 309
-        Width = 473
+        Width = 459
         Height = 22
         Style = csDropDownList
         Anchors = [akLeft, akTop, akRight]
@@ -310,7 +310,7 @@ object frmPreferences: TfrmPreferences
       object comboWebSearchBaseUrl: TComboBox
         Left = 220
         Top = 336
-        Width = 473
+        Width = 459
         Height = 22
         Anchors = [akLeft, akTop, akRight]
         TabOrder = 19
@@ -327,7 +327,7 @@ object frmPreferences: TfrmPreferences
           'https://www.google.com/search?q=%query')
       end
       object chkThemePreview: TCheckBox
-        Left = 586
+        Left = 572
         Top = 284
         Width = 97
         Height = 17
@@ -342,8 +342,8 @@ object frmPreferences: TfrmPreferences
       ImageIndex = 56
       ImageName = 'icons8-index'
       DesignSize = (
-        698
-        380)
+        684
+        366)
       object Label4: TLabel
         Left = 8
         Top = 11
@@ -485,7 +485,7 @@ object frmPreferences: TfrmPreferences
       object editLogDir: TButtonedEdit
         Left = 361
         Top = 62
-        Width = 332
+        Width = 318
         Height = 22
         Anchors = [akLeft, akTop, akRight]
         Enabled = False
@@ -564,8 +564,8 @@ object frmPreferences: TfrmPreferences
       ImageIndex = 57
       ImageName = 'icons8-play'
       DesignSize = (
-        698
-        380)
+        684
+        366)
       object lblFont: TLabel
         Left = 8
         Top = 11
@@ -772,8 +772,8 @@ object frmPreferences: TfrmPreferences
         AlignWithMargins = True
         Left = 371
         Top = 156
-        Width = 322
-        Height = 197
+        Width = 308
+        Height = 183
         Cursor = crHandPoint
         SingleLineMode = False
         Anchors = [akLeft, akTop, akRight, akBottom]
@@ -813,7 +813,7 @@ object frmPreferences: TfrmPreferences
       object chkQueryWarningsMessage: TCheckBox
         Left = 220
         Top = 110
-        Width = 473
+        Width = 459
         Height = 17
         Anchors = [akLeft, akTop, akRight]
         Caption = 'Show query warnings dialog'
@@ -823,7 +823,7 @@ object frmPreferences: TfrmPreferences
       object chkAutoUppercase: TCheckBox
         Left = 220
         Top = 133
-        Width = 473
+        Width = 459
         Height = 17
         Anchors = [akLeft, akTop, akRight]
         Caption = 'Auto uppercase reserved words and functions'
@@ -846,7 +846,7 @@ object frmPreferences: TfrmPreferences
       object chkCompletionProposalSearchOnMid: TCheckBox
         Left = 496
         Top = 87
-        Width = 197
+        Width = 183
         Height = 17
         Anchors = [akLeft, akTop, akRight]
         Caption = 'Find matches in the middle'
@@ -880,8 +880,8 @@ object frmPreferences: TfrmPreferences
       ImageIndex = 41
       ImageName = 'icons8-data-grid'
       DesignSize = (
-        698
-        380)
+        684
+        366)
       object lblMaxColWidth: TLabel
         Left = 8
         Top = 11
@@ -1105,7 +1105,7 @@ object frmPreferences: TfrmPreferences
       object chkLocalNumberFormat: TCheckBox
         Left = 220
         Top = 281
-        Width = 473
+        Width = 459
         Height = 17
         Anchors = [akLeft, akTop, akRight]
         Caption = 'Local number format'
@@ -1115,7 +1115,7 @@ object frmPreferences: TfrmPreferences
       object chkHintsOnResultTabs: TCheckBox
         Left = 220
         Top = 327
-        Width = 473
+        Width = 459
         Height = 17
         Anchors = [akLeft, akTop, akRight]
         Caption = 'Pop up SQL text over result tabs'
@@ -1161,7 +1161,7 @@ object frmPreferences: TfrmPreferences
       object chkLowercaseHex: TCheckBox
         Left = 220
         Top = 304
-        Width = 473
+        Width = 459
         Height = 17
         Anchors = [akLeft, akTop, akRight]
         Caption = 'Lowercase hexadecimal'
@@ -1190,11 +1190,11 @@ object frmPreferences: TfrmPreferences
       ImageIndex = 33
       ImageName = 'icons8-compose'
       DesignSize = (
-        698
-        380)
+        684
+        366)
       object lblLineBreakStyle: TLabel
-        Left = 8
-        Top = 212
+        Left = 3
+        Top = 235
         Width = 124
         Height = 14
         Caption = 'Default linebreak style:'
@@ -1202,7 +1202,7 @@ object frmPreferences: TfrmPreferences
       object chkEditorBinary: TCheckBox
         Left = 220
         Top = 8
-        Width = 473
+        Width = 459
         Height = 17
         Anchors = [akLeft, akTop, akRight]
         Caption = 'Enable popup BLOB/HEX editor'
@@ -1212,7 +1212,7 @@ object frmPreferences: TfrmPreferences
       object chkEditorDatetime: TCheckBox
         Left = 220
         Top = 31
-        Width = 473
+        Width = 459
         Height = 17
         Anchors = [akLeft, akTop, akRight]
         Caption = 'Enable inplace date/time editor'
@@ -1222,7 +1222,7 @@ object frmPreferences: TfrmPreferences
       object chkPrefillDateTime: TCheckBox
         Left = 220
         Top = 54
-        Width = 473
+        Width = 459
         Height = 17
         Anchors = [akLeft, akTop, akRight]
         Caption = 'Prefill empty date/time fields with current date/time'
@@ -1232,7 +1232,7 @@ object frmPreferences: TfrmPreferences
       object chkEditorEnum: TCheckBox
         Left = 220
         Top = 77
-        Width = 473
+        Width = 459
         Height = 17
         Anchors = [akLeft, akTop, akRight]
         Caption = 'Enable ENUM pulldown editor'
@@ -1242,7 +1242,7 @@ object frmPreferences: TfrmPreferences
       object chkEditorSet: TCheckBox
         Left = 220
         Top = 100
-        Width = 473
+        Width = 459
         Height = 17
         Anchors = [akLeft, akTop, akRight]
         Caption = 'Enable SET checkbox editor'
@@ -1252,7 +1252,7 @@ object frmPreferences: TfrmPreferences
       object chkReuseEditorConfiguration: TCheckBox
         Left = 220
         Top = 163
-        Width = 473
+        Width = 459
         Height = 17
         Anchors = [akLeft, akTop, akRight]
         Caption = 'Remember filters, sorting and column selection across sessions'
@@ -1262,7 +1262,7 @@ object frmPreferences: TfrmPreferences
       object chkForeignDropDown: TCheckBox
         Left = 220
         Top = 186
-        Width = 473
+        Width = 459
         Height = 17
         Anchors = [akLeft, akTop, akRight]
         Caption = 'Show values in foreign key columns'
@@ -1271,11 +1271,11 @@ object frmPreferences: TfrmPreferences
       end
       object comboLineBreakStyle: TComboBox
         Left = 220
-        Top = 209
+        Top = 232
         Width = 145
         Height = 22
         Style = csDropDownList
-        TabOrder = 8
+        TabOrder = 9
         OnClick = Modified
       end
       object chkColumnHeaderClick: TCheckBox
@@ -1302,8 +1302,8 @@ object frmPreferences: TfrmPreferences
       ImageIndex = 13
       ImageName = 'icons8-lightning-bolt-100'
       DesignSize = (
-        698
-        380)
+        684
+        366)
       object lblShortcut1: TLabel
         Left = 306
         Top = 64
@@ -1314,7 +1314,7 @@ object frmPreferences: TfrmPreferences
       object lblShortcutHint: TLabel
         Left = 306
         Top = 3
-        Width = 389
+        Width = 375
         Height = 55
         Anchors = [akLeft, akTop, akRight]
         AutoSize = False
@@ -1332,7 +1332,7 @@ object frmPreferences: TfrmPreferences
         Left = 0
         Top = 0
         Width = 300
-        Height = 380
+        Height = 366
         Align = alLeft
         Header.AutoSizeIndex = 0
         Header.MainColumn = -1
@@ -1351,7 +1351,7 @@ object frmPreferences: TfrmPreferences
       object HotKey1: THotKey
         Left = 306
         Top = 83
-        Width = 277
+        Width = 263
         Height = 19
         Anchors = [akLeft, akTop, akRight]
         HotKey = 0
@@ -1364,7 +1364,7 @@ object frmPreferences: TfrmPreferences
       object HotKey2: THotKey
         Left = 306
         Top = 127
-        Width = 277
+        Width = 263
         Height = 19
         Anchors = [akLeft, akTop, akRight]
         HotKey = 0
@@ -1381,12 +1381,12 @@ object frmPreferences: TfrmPreferences
       ImageIndex = 10
       ImageName = 'icons8-save-button-100'
       DesignSize = (
-        698
-        380)
+        684
+        366)
       object chkAskFileSave: TCheckBox
         Left = 220
         Top = 8
-        Width = 473
+        Width = 459
         Height = 17
         Anchors = [akLeft, akTop, akRight]
         Caption = 'Prompt to save modified files on tab close'
@@ -1398,7 +1398,7 @@ object frmPreferences: TfrmPreferences
       object chkRestoreTabs: TCheckBox
         Left = 220
         Top = 31
-        Width = 473
+        Width = 459
         Height = 17
         Anchors = [akLeft, akTop, akRight]
         Caption = 'Reopen previously used SQL files and unsaved content in tabs *'
@@ -1416,8 +1416,8 @@ object frmPreferences: TfrmPreferences
     end
   end
   object btnCancel: TButton
-    Left = 559
-    Top = 421
+    Left = 545
+    Top = 409
     Width = 75
     Height = 25
     Anchors = [akRight, akBottom]
@@ -1427,8 +1427,8 @@ object frmPreferences: TfrmPreferences
     TabOrder = 2
   end
   object btnOK: TButton
-    Left = 479
-    Top = 421
+    Left = 465
+    Top = 409
     Width = 75
     Height = 25
     Anchors = [akRight, akBottom]
@@ -1439,8 +1439,8 @@ object frmPreferences: TfrmPreferences
     OnClick = Apply
   end
   object btnApply: TButton
-    Left = 639
-    Top = 421
+    Left = 625
+    Top = 409
     Width = 75
     Height = 25
     Anchors = [akRight, akBottom]
@@ -1451,7 +1451,7 @@ object frmPreferences: TfrmPreferences
   end
   object btnRestoreDefaults: TButton
     Left = 8
-    Top = 421
+    Top = 409
     Width = 177
     Height = 25
     Anchors = [akLeft, akBottom]