diff --git a/picard/ui/ui_options_general.py b/picard/ui/ui_options_general.py
index dd309860d..934309172 100644
--- a/picard/ui/ui_options_general.py
+++ b/picard/ui/ui_options_general.py
@@ -10,7 +10,7 @@ from PyQt5 import QtCore, QtGui, QtWidgets
 class Ui_GeneralOptionsPage(object):
     def setupUi(self, GeneralOptionsPage):
         GeneralOptionsPage.setObjectName("GeneralOptionsPage")
-        GeneralOptionsPage.resize(403, 599)
+        GeneralOptionsPage.resize(403, 640)
         sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Preferred, QtWidgets.QSizePolicy.Preferred)
         sizePolicy.setHorizontalStretch(0)
         sizePolicy.setVerticalStretch(0)
@@ -190,7 +190,8 @@ class Ui_GeneralOptionsPage(object):
         GeneralOptionsPage.setTabOrder(self.analyze_new_files, self.cluster_new_files)
         GeneralOptionsPage.setTabOrder(self.cluster_new_files, self.ignore_file_mbids)
         GeneralOptionsPage.setTabOrder(self.ignore_file_mbids, self.check_for_plugin_updates)
-        GeneralOptionsPage.setTabOrder(self.check_for_plugin_updates, self.update_check_days)
+        GeneralOptionsPage.setTabOrder(self.check_for_plugin_updates, self.check_for_updates)
+        GeneralOptionsPage.setTabOrder(self.check_for_updates, self.update_check_days)
         GeneralOptionsPage.setTabOrder(self.update_check_days, self.update_level)
 
     def retranslateUi(self, GeneralOptionsPage):
diff --git a/picard/ui/ui_options_interface_top_tags.py b/picard/ui/ui_options_interface_top_tags.py
index f2004a8ed..80d22d71e 100644
--- a/picard/ui/ui_options_interface_top_tags.py
+++ b/picard/ui/ui_options_interface_top_tags.py
@@ -1,38 +1,38 @@
-# -*- coding: utf-8 -*-
-
-# Automatically generated - don't edit.
-# Use `python setup.py build_ui` to update it.
-
-
-from PyQt5 import QtCore, QtGui, QtWidgets
-
-
-class Ui_InterfaceTopTagsOptionsPage(object):
-    def setupUi(self, InterfaceTopTagsOptionsPage):
-        InterfaceTopTagsOptionsPage.setObjectName("InterfaceTopTagsOptionsPage")
-        InterfaceTopTagsOptionsPage.resize(418, 310)
-        self.vboxlayout = QtWidgets.QVBoxLayout(InterfaceTopTagsOptionsPage)
-        self.vboxlayout.setContentsMargins(9, 9, 9, 9)
-        self.vboxlayout.setSpacing(6)
-        self.vboxlayout.setObjectName("vboxlayout")
-        self.top_tags_groupBox = QtWidgets.QGroupBox(InterfaceTopTagsOptionsPage)
-        self.top_tags_groupBox.setObjectName("top_tags_groupBox")
-        self.verticalLayout = QtWidgets.QVBoxLayout(self.top_tags_groupBox)
-        self.verticalLayout.setObjectName("verticalLayout")
-        self.top_tags_list = TagListEditor(self.top_tags_groupBox)
-        sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Preferred, QtWidgets.QSizePolicy.Expanding)
-        sizePolicy.setHorizontalStretch(0)
-        sizePolicy.setVerticalStretch(0)
-        sizePolicy.setHeightForWidth(self.top_tags_list.sizePolicy().hasHeightForWidth())
-        self.top_tags_list.setSizePolicy(sizePolicy)
-        self.top_tags_list.setObjectName("top_tags_list")
-        self.verticalLayout.addWidget(self.top_tags_list)
-        self.vboxlayout.addWidget(self.top_tags_groupBox)
-
-        self.retranslateUi(InterfaceTopTagsOptionsPage)
-        QtCore.QMetaObject.connectSlotsByName(InterfaceTopTagsOptionsPage)
-
-    def retranslateUi(self, InterfaceTopTagsOptionsPage):
-        _translate = QtCore.QCoreApplication.translate
-        self.top_tags_groupBox.setTitle(_("Show the below tags above all other tags in the metadata view"))
-from picard.ui.widgets.taglisteditor import TagListEditor
+# -*- coding: utf-8 -*-
+
+# Automatically generated - don't edit.
+# Use `python setup.py build_ui` to update it.
+
+
+from PyQt5 import QtCore, QtGui, QtWidgets
+
+
+class Ui_InterfaceTopTagsOptionsPage(object):
+    def setupUi(self, InterfaceTopTagsOptionsPage):
+        InterfaceTopTagsOptionsPage.setObjectName("InterfaceTopTagsOptionsPage")
+        InterfaceTopTagsOptionsPage.resize(418, 310)
+        self.vboxlayout = QtWidgets.QVBoxLayout(InterfaceTopTagsOptionsPage)
+        self.vboxlayout.setContentsMargins(9, 9, 9, 9)
+        self.vboxlayout.setSpacing(6)
+        self.vboxlayout.setObjectName("vboxlayout")
+        self.top_tags_groupBox = QtWidgets.QGroupBox(InterfaceTopTagsOptionsPage)
+        self.top_tags_groupBox.setObjectName("top_tags_groupBox")
+        self.verticalLayout = QtWidgets.QVBoxLayout(self.top_tags_groupBox)
+        self.verticalLayout.setObjectName("verticalLayout")
+        self.top_tags_list = TagListEditor(self.top_tags_groupBox)
+        sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Preferred, QtWidgets.QSizePolicy.Expanding)
+        sizePolicy.setHorizontalStretch(0)
+        sizePolicy.setVerticalStretch(0)
+        sizePolicy.setHeightForWidth(self.top_tags_list.sizePolicy().hasHeightForWidth())
+        self.top_tags_list.setSizePolicy(sizePolicy)
+        self.top_tags_list.setObjectName("top_tags_list")
+        self.verticalLayout.addWidget(self.top_tags_list)
+        self.vboxlayout.addWidget(self.top_tags_groupBox)
+
+        self.retranslateUi(InterfaceTopTagsOptionsPage)
+        QtCore.QMetaObject.connectSlotsByName(InterfaceTopTagsOptionsPage)
+
+    def retranslateUi(self, InterfaceTopTagsOptionsPage):
+        _translate = QtCore.QCoreApplication.translate
+        self.top_tags_groupBox.setTitle(_("Show the below tags above all other tags in the metadata view"))
+from picard.ui.widgets.taglisteditor import TagListEditor
diff --git a/picard/ui/ui_options_renaming.py b/picard/ui/ui_options_renaming.py
index 0e747c31f..201f0cb9c 100644
--- a/picard/ui/ui_options_renaming.py
+++ b/picard/ui/ui_options_renaming.py
@@ -11,7 +11,7 @@ class Ui_RenamingOptionsPage(object):
     def setupUi(self, RenamingOptionsPage):
         RenamingOptionsPage.setObjectName("RenamingOptionsPage")
         RenamingOptionsPage.setEnabled(True)
-        RenamingOptionsPage.resize(453, 468)
+        RenamingOptionsPage.resize(453, 489)
         sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Preferred)
         sizePolicy.setHorizontalStretch(0)
         sizePolicy.setVerticalStretch(0)
@@ -142,8 +142,8 @@ class Ui_RenamingOptionsPage(object):
         RenamingOptionsPage.setTabOrder(self.rename_files, self.naming_script_selector)
         RenamingOptionsPage.setTabOrder(self.naming_script_selector, self.open_script_editor)
         RenamingOptionsPage.setTabOrder(self.open_script_editor, self.example_filename_before)
-        RenamingOptionsPage.setTabOrder(self.example_filename_before, self.example_filename_sample_files_button)
-        RenamingOptionsPage.setTabOrder(self.example_filename_sample_files_button, self.example_filename_after)
+        RenamingOptionsPage.setTabOrder(self.example_filename_before, self.example_filename_after)
+        RenamingOptionsPage.setTabOrder(self.example_filename_after, self.example_filename_sample_files_button)
 
     def retranslateUi(self, RenamingOptionsPage):
         _translate = QtCore.QCoreApplication.translate
diff --git a/picard/ui/ui_options_renaming_compat.py b/picard/ui/ui_options_renaming_compat.py
index 2af0e4448..0ce14681e 100644
--- a/picard/ui/ui_options_renaming_compat.py
+++ b/picard/ui/ui_options_renaming_compat.py
@@ -78,7 +78,11 @@ class Ui_RenamingCompatOptionsPage(object):
         self.windows_compatibility.toggled['bool'].connect(self.windows_long_paths.setEnabled) # type: ignore
         self.windows_compatibility.toggled['bool'].connect(self.btn_windows_compatibility_change.setEnabled) # type: ignore
         QtCore.QMetaObject.connectSlotsByName(RenamingCompatOptionsPage)
-        RenamingCompatOptionsPage.setTabOrder(self.ascii_filenames, self.windows_long_paths)
+        RenamingCompatOptionsPage.setTabOrder(self.ascii_filenames, self.windows_compatibility)
+        RenamingCompatOptionsPage.setTabOrder(self.windows_compatibility, self.btn_windows_compatibility_change)
+        RenamingCompatOptionsPage.setTabOrder(self.btn_windows_compatibility_change, self.windows_long_paths)
+        RenamingCompatOptionsPage.setTabOrder(self.windows_long_paths, self.replace_spaces_with_underscores)
+        RenamingCompatOptionsPage.setTabOrder(self.replace_spaces_with_underscores, self.replace_dir_separator)
 
     def retranslateUi(self, RenamingCompatOptionsPage):
         _translate = QtCore.QCoreApplication.translate
diff --git a/ui/options_general.ui b/ui/options_general.ui
index 0aa65fcd9..8c453e234 100644
--- a/ui/options_general.ui
+++ b/ui/options_general.ui
@@ -7,7 +7,7 @@
     <x>0</x>
     <y>0</y>
     <width>403</width>
-    <height>599</height>
+    <height>640</height>
    </rect>
   </property>
   <property name="sizePolicy">
@@ -379,6 +379,7 @@ QCheckBox { color: black }</string>
   <tabstop>cluster_new_files</tabstop>
   <tabstop>ignore_file_mbids</tabstop>
   <tabstop>check_for_plugin_updates</tabstop>
+  <tabstop>check_for_updates</tabstop>
   <tabstop>update_check_days</tabstop>
   <tabstop>update_level</tabstop>
  </tabstops>
diff --git a/ui/options_renaming.ui b/ui/options_renaming.ui
index bbfa98a84..18249076f 100644
--- a/ui/options_renaming.ui
+++ b/ui/options_renaming.ui
@@ -10,7 +10,7 @@
     <x>0</x>
     <y>0</y>
     <width>453</width>
-    <height>468</height>
+    <height>489</height>
    </rect>
   </property>
   <property name="sizePolicy">
@@ -289,8 +289,8 @@
   <tabstop>naming_script_selector</tabstop>
   <tabstop>open_script_editor</tabstop>
   <tabstop>example_filename_before</tabstop>
-  <tabstop>example_filename_sample_files_button</tabstop>
   <tabstop>example_filename_after</tabstop>
+  <tabstop>example_filename_sample_files_button</tabstop>
  </tabstops>
  <resources/>
  <connections/>
diff --git a/ui/options_renaming_compat.ui b/ui/options_renaming_compat.ui
index 7befe3024..f117b0d16 100644
--- a/ui/options_renaming_compat.ui
+++ b/ui/options_renaming_compat.ui
@@ -137,7 +137,11 @@
  </widget>
  <tabstops>
   <tabstop>ascii_filenames</tabstop>
+  <tabstop>windows_compatibility</tabstop>
+  <tabstop>btn_windows_compatibility_change</tabstop>
   <tabstop>windows_long_paths</tabstop>
+  <tabstop>replace_spaces_with_underscores</tabstop>
+  <tabstop>replace_dir_separator</tabstop>
  </tabstops>
  <resources/>
  <connections>