diff --git a/picard/ui/options/interface.py b/picard/ui/options/interface.py
index 9e271a4bb..d70fb1261 100644
--- a/picard/ui/options/interface.py
+++ b/picard/ui/options/interface.py
@@ -209,8 +209,7 @@ class InterfaceOptionsPage(OptionsPage):
         self.update_buttons = self.move_view.update_buttons
 
         if not OS_SUPPORTS_THEMES:
-            self.ui.ui_theme.hide()
-            self.ui.label_theme.hide()
+            self.ui.ui_theme_container.hide()
 
     def load(self):
         config = get_config()
diff --git a/picard/ui/theme.py b/picard/ui/theme.py
index b7b60a996..bb4307a2c 100644
--- a/picard/ui/theme.py
+++ b/picard/ui/theme.py
@@ -49,7 +49,6 @@ if IS_MACOS:
         mojave_version = (10, 14)  # Dark theme support was introduced in Mojave
         return current_version >= mojave_version
     OS_SUPPORTS_THEMES = is_dark_theme_supported()
-    del is_dark_theme_supported
 
 elif IS_HAIKU:
     OS_SUPPORTS_THEMES = False
@@ -65,6 +64,10 @@ class UiTheme(Enum):
     def __str__(self):
         return self.value
 
+    @classmethod
+    def __missing__(cls, value):
+        return cls.DEFAULT
+
 
 # Those are labels for display
 # example to display translated "System" theme name: _(UI_THEMES[UiTheme.DEFAULT])
diff --git a/picard/ui/ui_options_interface.py b/picard/ui/ui_options_interface.py
index 6b10ceffa..34a33f1af 100644
--- a/picard/ui/ui_options_interface.py
+++ b/picard/ui/ui_options_interface.py
@@ -1,160 +1,178 @@
-# -*- 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_InterfaceOptionsPage(object):
-    def setupUi(self, InterfaceOptionsPage):
-        InterfaceOptionsPage.setObjectName("InterfaceOptionsPage")
-        InterfaceOptionsPage.resize(466, 505)
-        self.vboxlayout = QtWidgets.QVBoxLayout(InterfaceOptionsPage)
-        self.vboxlayout.setObjectName("vboxlayout")
-        self.groupBox_2 = QtWidgets.QGroupBox(InterfaceOptionsPage)
-        self.groupBox_2.setObjectName("groupBox_2")
-        self.vboxlayout1 = QtWidgets.QVBoxLayout(self.groupBox_2)
-        self.vboxlayout1.setObjectName("vboxlayout1")
-        self.toolbar_show_labels = QtWidgets.QCheckBox(self.groupBox_2)
-        self.toolbar_show_labels.setObjectName("toolbar_show_labels")
-        self.vboxlayout1.addWidget(self.toolbar_show_labels)
-        self.toolbar_multiselect = QtWidgets.QCheckBox(self.groupBox_2)
-        self.toolbar_multiselect.setObjectName("toolbar_multiselect")
-        self.vboxlayout1.addWidget(self.toolbar_multiselect)
-        self.builtin_search = QtWidgets.QCheckBox(self.groupBox_2)
-        self.builtin_search.setObjectName("builtin_search")
-        self.vboxlayout1.addWidget(self.builtin_search)
-        self.use_adv_search_syntax = QtWidgets.QCheckBox(self.groupBox_2)
-        self.use_adv_search_syntax.setObjectName("use_adv_search_syntax")
-        self.vboxlayout1.addWidget(self.use_adv_search_syntax)
-        self.quit_confirmation = QtWidgets.QCheckBox(self.groupBox_2)
-        self.quit_confirmation.setObjectName("quit_confirmation")
-        self.vboxlayout1.addWidget(self.quit_confirmation)
-        self.filebrowser_horizontal_autoscroll = QtWidgets.QCheckBox(self.groupBox_2)
-        self.filebrowser_horizontal_autoscroll.setObjectName("filebrowser_horizontal_autoscroll")
-        self.vboxlayout1.addWidget(self.filebrowser_horizontal_autoscroll)
-        self.starting_directory = QtWidgets.QCheckBox(self.groupBox_2)
-        self.starting_directory.setObjectName("starting_directory")
-        self.vboxlayout1.addWidget(self.starting_directory)
-        self.horizontalLayout_4 = QtWidgets.QHBoxLayout()
-        self.horizontalLayout_4.setSpacing(2)
-        self.horizontalLayout_4.setObjectName("horizontalLayout_4")
-        self.starting_directory_path = QtWidgets.QLineEdit(self.groupBox_2)
-        self.starting_directory_path.setEnabled(False)
-        self.starting_directory_path.setObjectName("starting_directory_path")
-        self.horizontalLayout_4.addWidget(self.starting_directory_path)
-        self.starting_directory_browse = QtWidgets.QPushButton(self.groupBox_2)
-        self.starting_directory_browse.setEnabled(False)
-        self.starting_directory_browse.setObjectName("starting_directory_browse")
-        self.horizontalLayout_4.addWidget(self.starting_directory_browse)
-        self.vboxlayout1.addLayout(self.horizontalLayout_4)
-        self.label = QtWidgets.QLabel(self.groupBox_2)
-        self.label.setObjectName("label")
-        self.vboxlayout1.addWidget(self.label)
-        self.horizontalLayout = QtWidgets.QHBoxLayout()
-        self.horizontalLayout.setObjectName("horizontalLayout")
-        self.ui_language = QtWidgets.QComboBox(self.groupBox_2)
-        self.ui_language.setObjectName("ui_language")
-        self.horizontalLayout.addWidget(self.ui_language)
-        spacerItem = QtWidgets.QSpacerItem(40, 20, QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Minimum)
-        self.horizontalLayout.addItem(spacerItem)
-        self.vboxlayout1.addLayout(self.horizontalLayout)
-        self.label_theme = QtWidgets.QLabel(self.groupBox_2)
-        self.label_theme.setObjectName("label_theme")
-        self.vboxlayout1.addWidget(self.label_theme)
-        self.horizontalLayout_2 = QtWidgets.QHBoxLayout()
-        self.horizontalLayout_2.setObjectName("horizontalLayout_2")
-        self.ui_theme = QtWidgets.QComboBox(self.groupBox_2)
-        self.ui_theme.setObjectName("ui_theme")
-        self.horizontalLayout_2.addWidget(self.ui_theme)
-        spacerItem1 = QtWidgets.QSpacerItem(40, 20, QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Minimum)
-        self.horizontalLayout_2.addItem(spacerItem1)
-        self.vboxlayout1.addLayout(self.horizontalLayout_2)
-        self.vboxlayout.addWidget(self.groupBox_2)
-        self.customize_toolbar_box = QtWidgets.QGroupBox(InterfaceOptionsPage)
-        sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.MinimumExpanding, QtWidgets.QSizePolicy.Preferred)
-        sizePolicy.setHorizontalStretch(0)
-        sizePolicy.setVerticalStretch(0)
-        sizePolicy.setHeightForWidth(self.customize_toolbar_box.sizePolicy().hasHeightForWidth())
-        self.customize_toolbar_box.setSizePolicy(sizePolicy)
-        self.customize_toolbar_box.setObjectName("customize_toolbar_box")
-        self.verticalLayout = QtWidgets.QVBoxLayout(self.customize_toolbar_box)
-        self.verticalLayout.setObjectName("verticalLayout")
-        self.toolbar_layout_list = QtWidgets.QListWidget(self.customize_toolbar_box)
-        sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Expanding)
-        sizePolicy.setHorizontalStretch(0)
-        sizePolicy.setVerticalStretch(0)
-        sizePolicy.setHeightForWidth(self.toolbar_layout_list.sizePolicy().hasHeightForWidth())
-        self.toolbar_layout_list.setSizePolicy(sizePolicy)
-        self.toolbar_layout_list.setObjectName("toolbar_layout_list")
-        self.verticalLayout.addWidget(self.toolbar_layout_list)
-        self.edit_button_box = QtWidgets.QWidget(self.customize_toolbar_box)
-        self.edit_button_box.setObjectName("edit_button_box")
-        self.edit_box_layout = QtWidgets.QHBoxLayout(self.edit_button_box)
-        self.edit_box_layout.setContentsMargins(0, 0, 0, 0)
-        self.edit_box_layout.setObjectName("edit_box_layout")
-        self.add_button = QtWidgets.QToolButton(self.edit_button_box)
-        self.add_button.setObjectName("add_button")
-        self.edit_box_layout.addWidget(self.add_button)
-        self.insert_separator_button = QtWidgets.QToolButton(self.edit_button_box)
-        self.insert_separator_button.setObjectName("insert_separator_button")
-        self.edit_box_layout.addWidget(self.insert_separator_button)
-        spacerItem2 = QtWidgets.QSpacerItem(50, 20, QtWidgets.QSizePolicy.MinimumExpanding, QtWidgets.QSizePolicy.Minimum)
-        self.edit_box_layout.addItem(spacerItem2)
-        self.up_button = QtWidgets.QToolButton(self.edit_button_box)
-        icon = QtGui.QIcon.fromTheme(":/images/16x16/go-up.png")
-        self.up_button.setIcon(icon)
-        self.up_button.setObjectName("up_button")
-        self.edit_box_layout.addWidget(self.up_button)
-        self.down_button = QtWidgets.QToolButton(self.edit_button_box)
-        icon = QtGui.QIcon.fromTheme(":/images/16x16/go-down.png")
-        self.down_button.setIcon(icon)
-        self.down_button.setObjectName("down_button")
-        self.edit_box_layout.addWidget(self.down_button)
-        self.remove_button = QtWidgets.QToolButton(self.edit_button_box)
-        self.remove_button.setObjectName("remove_button")
-        self.edit_box_layout.addWidget(self.remove_button)
-        self.verticalLayout.addWidget(self.edit_button_box)
-        self.vboxlayout.addWidget(self.customize_toolbar_box)
-
-        self.retranslateUi(InterfaceOptionsPage)
-        QtCore.QMetaObject.connectSlotsByName(InterfaceOptionsPage)
-        InterfaceOptionsPage.setTabOrder(self.toolbar_show_labels, self.toolbar_multiselect)
-        InterfaceOptionsPage.setTabOrder(self.toolbar_multiselect, self.builtin_search)
-        InterfaceOptionsPage.setTabOrder(self.builtin_search, self.use_adv_search_syntax)
-        InterfaceOptionsPage.setTabOrder(self.use_adv_search_syntax, self.quit_confirmation)
-        InterfaceOptionsPage.setTabOrder(self.quit_confirmation, self.starting_directory)
-        InterfaceOptionsPage.setTabOrder(self.starting_directory, self.starting_directory_path)
-        InterfaceOptionsPage.setTabOrder(self.starting_directory_path, self.starting_directory_browse)
-        InterfaceOptionsPage.setTabOrder(self.starting_directory_browse, self.ui_language)
-        InterfaceOptionsPage.setTabOrder(self.ui_language, self.toolbar_layout_list)
-        InterfaceOptionsPage.setTabOrder(self.toolbar_layout_list, self.add_button)
-        InterfaceOptionsPage.setTabOrder(self.add_button, self.insert_separator_button)
-        InterfaceOptionsPage.setTabOrder(self.insert_separator_button, self.up_button)
-        InterfaceOptionsPage.setTabOrder(self.up_button, self.down_button)
-        InterfaceOptionsPage.setTabOrder(self.down_button, self.remove_button)
-
-    def retranslateUi(self, InterfaceOptionsPage):
-        _translate = QtCore.QCoreApplication.translate
-        self.groupBox_2.setTitle(_("Miscellaneous"))
-        self.toolbar_show_labels.setText(_("Show text labels under icons"))
-        self.toolbar_multiselect.setText(_("Allow selection of multiple directories"))
-        self.builtin_search.setText(_("Use builtin search rather than looking in browser"))
-        self.use_adv_search_syntax.setText(_("Use advanced query syntax"))
-        self.quit_confirmation.setText(_("Show a quit confirmation dialog for unsaved changes"))
-        self.filebrowser_horizontal_autoscroll.setText(_("Adjust horizontal position in file browser automatically"))
-        self.starting_directory.setText(_("Begin browsing in the following directory:"))
-        self.starting_directory_browse.setText(_("Browse..."))
-        self.label.setText(_("User interface language:"))
-        self.label_theme.setText(_("User interface color theme:"))
-        self.customize_toolbar_box.setTitle(_("Customize Action Toolbar"))
-        self.add_button.setToolTip(_("Add a new button to Toolbar"))
-        self.add_button.setText(_("Add Action"))
-        self.insert_separator_button.setToolTip(_("Insert a separator"))
-        self.insert_separator_button.setText(_("Add Separator"))
-        self.up_button.setToolTip(_("Move selected item up"))
-        self.down_button.setToolTip(_("Move selected item down"))
-        self.remove_button.setToolTip(_("Remove button from toolbar"))
-        self.remove_button.setText(_("Remove"))
+# -*- 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_InterfaceOptionsPage(object):
+    def setupUi(self, InterfaceOptionsPage):
+        InterfaceOptionsPage.setObjectName("InterfaceOptionsPage")
+        InterfaceOptionsPage.resize(466, 735)
+        self.vboxlayout = QtWidgets.QVBoxLayout(InterfaceOptionsPage)
+        self.vboxlayout.setObjectName("vboxlayout")
+        self.groupBox_2 = QtWidgets.QGroupBox(InterfaceOptionsPage)
+        self.groupBox_2.setObjectName("groupBox_2")
+        self.vboxlayout1 = QtWidgets.QVBoxLayout(self.groupBox_2)
+        self.vboxlayout1.setObjectName("vboxlayout1")
+        self.toolbar_show_labels = QtWidgets.QCheckBox(self.groupBox_2)
+        self.toolbar_show_labels.setObjectName("toolbar_show_labels")
+        self.vboxlayout1.addWidget(self.toolbar_show_labels)
+        self.toolbar_multiselect = QtWidgets.QCheckBox(self.groupBox_2)
+        self.toolbar_multiselect.setObjectName("toolbar_multiselect")
+        self.vboxlayout1.addWidget(self.toolbar_multiselect)
+        self.builtin_search = QtWidgets.QCheckBox(self.groupBox_2)
+        self.builtin_search.setObjectName("builtin_search")
+        self.vboxlayout1.addWidget(self.builtin_search)
+        self.use_adv_search_syntax = QtWidgets.QCheckBox(self.groupBox_2)
+        self.use_adv_search_syntax.setObjectName("use_adv_search_syntax")
+        self.vboxlayout1.addWidget(self.use_adv_search_syntax)
+        self.quit_confirmation = QtWidgets.QCheckBox(self.groupBox_2)
+        self.quit_confirmation.setObjectName("quit_confirmation")
+        self.vboxlayout1.addWidget(self.quit_confirmation)
+        self.filebrowser_horizontal_autoscroll = QtWidgets.QCheckBox(self.groupBox_2)
+        self.filebrowser_horizontal_autoscroll.setObjectName("filebrowser_horizontal_autoscroll")
+        self.vboxlayout1.addWidget(self.filebrowser_horizontal_autoscroll)
+        self.starting_directory = QtWidgets.QCheckBox(self.groupBox_2)
+        self.starting_directory.setObjectName("starting_directory")
+        self.vboxlayout1.addWidget(self.starting_directory)
+        self.horizontalLayout_4 = QtWidgets.QHBoxLayout()
+        self.horizontalLayout_4.setSpacing(2)
+        self.horizontalLayout_4.setObjectName("horizontalLayout_4")
+        self.starting_directory_path = QtWidgets.QLineEdit(self.groupBox_2)
+        self.starting_directory_path.setEnabled(False)
+        self.starting_directory_path.setObjectName("starting_directory_path")
+        self.horizontalLayout_4.addWidget(self.starting_directory_path)
+        self.starting_directory_browse = QtWidgets.QPushButton(self.groupBox_2)
+        self.starting_directory_browse.setEnabled(False)
+        self.starting_directory_browse.setObjectName("starting_directory_browse")
+        self.horizontalLayout_4.addWidget(self.starting_directory_browse)
+        self.vboxlayout1.addLayout(self.horizontalLayout_4)
+        self.label = QtWidgets.QLabel(self.groupBox_2)
+        self.label.setObjectName("label")
+        self.vboxlayout1.addWidget(self.label)
+        self.horizontalLayout = QtWidgets.QHBoxLayout()
+        self.horizontalLayout.setObjectName("horizontalLayout")
+        self.ui_language = QtWidgets.QComboBox(self.groupBox_2)
+        self.ui_language.setObjectName("ui_language")
+        self.horizontalLayout.addWidget(self.ui_language)
+        spacerItem = QtWidgets.QSpacerItem(40, 20, QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Minimum)
+        self.horizontalLayout.addItem(spacerItem)
+        self.vboxlayout1.addLayout(self.horizontalLayout)
+        self.ui_theme_container = QtWidgets.QWidget(self.groupBox_2)
+        self.ui_theme_container.setEnabled(True)
+        sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Preferred, QtWidgets.QSizePolicy.Preferred)
+        sizePolicy.setHorizontalStretch(0)
+        sizePolicy.setVerticalStretch(0)
+        sizePolicy.setHeightForWidth(self.ui_theme_container.sizePolicy().hasHeightForWidth())
+        self.ui_theme_container.setSizePolicy(sizePolicy)
+        self.ui_theme_container.setMinimumSize(QtCore.QSize(0, 55))
+        self.ui_theme_container.setBaseSize(QtCore.QSize(0, 30))
+        self.ui_theme_container.setObjectName("ui_theme_container")
+        self.verticalLayoutWidget = QtWidgets.QWidget(self.ui_theme_container)
+        self.verticalLayoutWidget.setGeometry(QtCore.QRect(-3, 0, 421, 52))
+        self.verticalLayoutWidget.setObjectName("verticalLayoutWidget")
+        self.verticalLayout_3 = QtWidgets.QVBoxLayout(self.verticalLayoutWidget)
+        self.verticalLayout_3.setContentsMargins(4, 0, 0, 0)
+        self.verticalLayout_3.setSpacing(6)
+        self.verticalLayout_3.setObjectName("verticalLayout_3")
+        self.label_theme = QtWidgets.QLabel(self.verticalLayoutWidget)
+        self.label_theme.setObjectName("label_theme")
+        self.verticalLayout_3.addWidget(self.label_theme)
+        self.horizontalLayout_2 = QtWidgets.QHBoxLayout()
+        self.horizontalLayout_2.setObjectName("horizontalLayout_2")
+        self.ui_theme = QtWidgets.QComboBox(self.verticalLayoutWidget)
+        self.ui_theme.setObjectName("ui_theme")
+        self.horizontalLayout_2.addWidget(self.ui_theme)
+        spacerItem1 = QtWidgets.QSpacerItem(40, 20, QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Minimum)
+        self.horizontalLayout_2.addItem(spacerItem1)
+        self.verticalLayout_3.addLayout(self.horizontalLayout_2)
+        self.vboxlayout1.addWidget(self.ui_theme_container)
+        self.vboxlayout.addWidget(self.groupBox_2)
+        self.customize_toolbar_box = QtWidgets.QGroupBox(InterfaceOptionsPage)
+        sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.MinimumExpanding, QtWidgets.QSizePolicy.Preferred)
+        sizePolicy.setHorizontalStretch(0)
+        sizePolicy.setVerticalStretch(0)
+        sizePolicy.setHeightForWidth(self.customize_toolbar_box.sizePolicy().hasHeightForWidth())
+        self.customize_toolbar_box.setSizePolicy(sizePolicy)
+        self.customize_toolbar_box.setObjectName("customize_toolbar_box")
+        self.verticalLayout = QtWidgets.QVBoxLayout(self.customize_toolbar_box)
+        self.verticalLayout.setObjectName("verticalLayout")
+        self.toolbar_layout_list = QtWidgets.QListWidget(self.customize_toolbar_box)
+        sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Expanding)
+        sizePolicy.setHorizontalStretch(0)
+        sizePolicy.setVerticalStretch(0)
+        sizePolicy.setHeightForWidth(self.toolbar_layout_list.sizePolicy().hasHeightForWidth())
+        self.toolbar_layout_list.setSizePolicy(sizePolicy)
+        self.toolbar_layout_list.setObjectName("toolbar_layout_list")
+        self.verticalLayout.addWidget(self.toolbar_layout_list)
+        self.edit_button_box = QtWidgets.QWidget(self.customize_toolbar_box)
+        self.edit_button_box.setObjectName("edit_button_box")
+        self.edit_box_layout = QtWidgets.QHBoxLayout(self.edit_button_box)
+        self.edit_box_layout.setContentsMargins(0, 0, 0, 0)
+        self.edit_box_layout.setObjectName("edit_box_layout")
+        self.add_button = QtWidgets.QToolButton(self.edit_button_box)
+        self.add_button.setObjectName("add_button")
+        self.edit_box_layout.addWidget(self.add_button)
+        self.insert_separator_button = QtWidgets.QToolButton(self.edit_button_box)
+        self.insert_separator_button.setObjectName("insert_separator_button")
+        self.edit_box_layout.addWidget(self.insert_separator_button)
+        spacerItem2 = QtWidgets.QSpacerItem(50, 20, QtWidgets.QSizePolicy.MinimumExpanding, QtWidgets.QSizePolicy.Minimum)
+        self.edit_box_layout.addItem(spacerItem2)
+        self.up_button = QtWidgets.QToolButton(self.edit_button_box)
+        icon = QtGui.QIcon.fromTheme(":/images/16x16/go-up.png")
+        self.up_button.setIcon(icon)
+        self.up_button.setObjectName("up_button")
+        self.edit_box_layout.addWidget(self.up_button)
+        self.down_button = QtWidgets.QToolButton(self.edit_button_box)
+        icon = QtGui.QIcon.fromTheme(":/images/16x16/go-down.png")
+        self.down_button.setIcon(icon)
+        self.down_button.setObjectName("down_button")
+        self.edit_box_layout.addWidget(self.down_button)
+        self.remove_button = QtWidgets.QToolButton(self.edit_button_box)
+        self.remove_button.setObjectName("remove_button")
+        self.edit_box_layout.addWidget(self.remove_button)
+        self.verticalLayout.addWidget(self.edit_button_box)
+        self.vboxlayout.addWidget(self.customize_toolbar_box)
+
+        self.retranslateUi(InterfaceOptionsPage)
+        QtCore.QMetaObject.connectSlotsByName(InterfaceOptionsPage)
+        InterfaceOptionsPage.setTabOrder(self.toolbar_show_labels, self.toolbar_multiselect)
+        InterfaceOptionsPage.setTabOrder(self.toolbar_multiselect, self.builtin_search)
+        InterfaceOptionsPage.setTabOrder(self.builtin_search, self.use_adv_search_syntax)
+        InterfaceOptionsPage.setTabOrder(self.use_adv_search_syntax, self.quit_confirmation)
+        InterfaceOptionsPage.setTabOrder(self.quit_confirmation, self.starting_directory)
+        InterfaceOptionsPage.setTabOrder(self.starting_directory, self.starting_directory_path)
+        InterfaceOptionsPage.setTabOrder(self.starting_directory_path, self.starting_directory_browse)
+        InterfaceOptionsPage.setTabOrder(self.starting_directory_browse, self.ui_language)
+        InterfaceOptionsPage.setTabOrder(self.ui_language, self.toolbar_layout_list)
+        InterfaceOptionsPage.setTabOrder(self.toolbar_layout_list, self.add_button)
+        InterfaceOptionsPage.setTabOrder(self.add_button, self.insert_separator_button)
+        InterfaceOptionsPage.setTabOrder(self.insert_separator_button, self.up_button)
+        InterfaceOptionsPage.setTabOrder(self.up_button, self.down_button)
+        InterfaceOptionsPage.setTabOrder(self.down_button, self.remove_button)
+
+    def retranslateUi(self, InterfaceOptionsPage):
+        _translate = QtCore.QCoreApplication.translate
+        self.groupBox_2.setTitle(_("Miscellaneous"))
+        self.toolbar_show_labels.setText(_("Show text labels under icons"))
+        self.toolbar_multiselect.setText(_("Allow selection of multiple directories"))
+        self.builtin_search.setText(_("Use builtin search rather than looking in browser"))
+        self.use_adv_search_syntax.setText(_("Use advanced query syntax"))
+        self.quit_confirmation.setText(_("Show a quit confirmation dialog for unsaved changes"))
+        self.filebrowser_horizontal_autoscroll.setText(_("Adjust horizontal position in file browser automatically"))
+        self.starting_directory.setText(_("Begin browsing in the following directory:"))
+        self.starting_directory_browse.setText(_("Browse..."))
+        self.label.setText(_("User interface language:"))
+        self.label_theme.setText(_("User interface color theme:"))
+        self.customize_toolbar_box.setTitle(_("Customize Action Toolbar"))
+        self.add_button.setToolTip(_("Add a new button to Toolbar"))
+        self.add_button.setText(_("Add Action"))
+        self.insert_separator_button.setToolTip(_("Insert a separator"))
+        self.insert_separator_button.setText(_("Add Separator"))
+        self.up_button.setToolTip(_("Move selected item up"))
+        self.down_button.setToolTip(_("Move selected item down"))
+        self.remove_button.setToolTip(_("Remove button from toolbar"))
+        self.remove_button.setText(_("Remove"))
diff --git a/ui/options_interface.ui b/ui/options_interface.ui
index 73112b8fa..05028f005 100644
--- a/ui/options_interface.ui
+++ b/ui/options_interface.ui
@@ -7,7 +7,7 @@
     <x>0</x>
     <y>0</y>
     <width>466</width>
-    <height>505</height>
+    <height>735</height>
    </rect>
   </property>
   <layout class="QVBoxLayout">
@@ -118,32 +118,75 @@
        </layout>
       </item>
       <item>
-       <widget class="QLabel" name="label_theme">
-        <property name="text">
-         <string>User interface color theme:</string>
+       <widget class="QWidget" name="ui_theme_container" native="true">
+        <property name="enabled">
+         <bool>true</bool>
         </property>
+        <property name="sizePolicy">
+         <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
+          <horstretch>0</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
+        </property>
+        <property name="minimumSize">
+         <size>
+          <width>0</width>
+          <height>55</height>
+         </size>
+        </property>
+        <property name="baseSize">
+         <size>
+          <width>0</width>
+          <height>30</height>
+         </size>
+        </property>
+        <widget class="QWidget" name="verticalLayoutWidget">
+         <property name="geometry">
+          <rect>
+           <x>-3</x>
+           <y>0</y>
+           <width>421</width>
+           <height>52</height>
+          </rect>
+         </property>
+         <layout class="QVBoxLayout" name="verticalLayout_3">
+          <property name="spacing">
+           <number>6</number>
+          </property>
+          <property name="leftMargin">
+           <number>4</number>
+          </property>
+          <item>
+           <widget class="QLabel" name="label_theme">
+            <property name="text">
+             <string>User interface color theme:</string>
+            </property>
+           </widget>
+          </item>
+          <item>
+           <layout class="QHBoxLayout" name="horizontalLayout_2">
+            <item>
+             <widget class="QComboBox" name="ui_theme"/>
+            </item>
+            <item>
+             <spacer name="horizontalSpacer_2">
+              <property name="orientation">
+               <enum>Qt::Horizontal</enum>
+              </property>
+              <property name="sizeHint" stdset="0">
+               <size>
+                <width>40</width>
+                <height>20</height>
+               </size>
+              </property>
+             </spacer>
+            </item>
+           </layout>
+          </item>
+         </layout>
+        </widget>
        </widget>
       </item>
-      <item>
-       <layout class="QHBoxLayout" name="horizontalLayout_2">
-        <item>
-         <widget class="QComboBox" name="ui_theme"/>
-        </item>
-        <item>
-         <spacer name="horizontalSpacer_2">
-          <property name="orientation">
-           <enum>Qt::Horizontal</enum>
-          </property>
-          <property name="sizeHint" stdset="0">
-           <size>
-            <width>40</width>
-            <height>20</height>
-           </size>
-          </property>
-         </spacer>
-        </item>
-       </layout>
-      </item>
      </layout>
     </widget>
    </item>
@@ -226,7 +269,8 @@
             <string>Move selected item up</string>
            </property>
            <property name="icon">
-            <iconset theme=":/images/16x16/go-up.png"/>
+            <iconset theme=":/images/16x16/go-up.png">
+             <normaloff>.</normaloff>.</iconset>
            </property>
           </widget>
          </item>
@@ -236,7 +280,8 @@
             <string>Move selected item down</string>
            </property>
            <property name="icon">
-            <iconset theme=":/images/16x16/go-down.png"/>
+            <iconset theme=":/images/16x16/go-down.png">
+             <normaloff>.</normaloff>.</iconset>
            </property>
           </widget>
          </item>