diff --git a/picard/ui/options/__init__.py b/picard/ui/options/__init__.py
index 25461fc38..711684da4 100644
--- a/picard/ui/options/__init__.py
+++ b/picard/ui/options/__init__.py
@@ -36,6 +36,11 @@ class OptionsPage(QtWidgets.QWidget):
     SORT_ORDER = 1000
     ACTIVE = True
     STYLESHEET_ERROR = "QWidget { background-color: #f55; color: white; font-weight:bold }"
+    STYLESHEET = "QLabel { qproperty-wordWrap: true; }"
+
+    def __init__(self, *args, **kwargs):
+        super().__init__(*args, **kwargs)
+        self.setStyleSheet(self.STYLESHEET)
 
     def info(self):
         raise NotImplementedError
diff --git a/picard/ui/ui_options_advanced.py b/picard/ui/ui_options_advanced.py
index 0148076ac..8f434de2f 100644
--- a/picard/ui/ui_options_advanced.py
+++ b/picard/ui/ui_options_advanced.py
@@ -28,7 +28,7 @@ class Ui_AdvancedOptionsPage(object):
         sizePolicy.setVerticalStretch(0)
         sizePolicy.setHeightForWidth(self.label_track_duration_diff.sizePolicy().hasHeightForWidth())
         self.label_track_duration_diff.setSizePolicy(sizePolicy)
-        self.label_track_duration_diff.setAlignment(QtCore.Qt.AlignRight|QtCore.Qt.AlignTrailing|QtCore.Qt.AlignVCenter)
+        self.label_track_duration_diff.setAlignment(QtCore.Qt.AlignLeading|QtCore.Qt.AlignLeft|QtCore.Qt.AlignVCenter)
         self.label_track_duration_diff.setObjectName("label_track_duration_diff")
         self.horizontalLayout.addWidget(self.label_track_duration_diff)
         self.ignore_track_duration_difference_under = QtWidgets.QSpinBox(self.groupBox)
@@ -45,10 +45,14 @@ class Ui_AdvancedOptionsPage(object):
         self.ignore_track_duration_difference_under.setProperty("value", 2)
         self.ignore_track_duration_difference_under.setObjectName("ignore_track_duration_difference_under")
         self.horizontalLayout.addWidget(self.ignore_track_duration_difference_under)
-        spacerItem = QtWidgets.QSpacerItem(4000, 20, QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Minimum)
-        self.horizontalLayout.addItem(spacerItem)
         self.gridlayout.addLayout(self.horizontalLayout, 6, 0, 2, 1)
         self.label_ignore_regex = QtWidgets.QLabel(self.groupBox)
+        sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Preferred, QtWidgets.QSizePolicy.Preferred)
+        sizePolicy.setHorizontalStretch(0)
+        sizePolicy.setVerticalStretch(0)
+        sizePolicy.setHeightForWidth(self.label_ignore_regex.sizePolicy().hasHeightForWidth())
+        self.label_ignore_regex.setSizePolicy(sizePolicy)
+        self.label_ignore_regex.setWordWrap(True)
         self.label_ignore_regex.setObjectName("label_ignore_regex")
         self.gridlayout.addWidget(self.label_ignore_regex, 1, 0, 1, 1)
         self.regex_error = QtWidgets.QLabel(self.groupBox)
@@ -80,8 +84,8 @@ class Ui_AdvancedOptionsPage(object):
         self.completeness_ignore_silence.setObjectName("completeness_ignore_silence")
         self.verticalLayout_2.addWidget(self.completeness_ignore_silence)
         self.vboxlayout.addWidget(self.groupBox_completeness)
-        spacerItem1 = QtWidgets.QSpacerItem(181, 21, QtWidgets.QSizePolicy.Minimum, QtWidgets.QSizePolicy.Expanding)
-        self.vboxlayout.addItem(spacerItem1)
+        spacerItem = QtWidgets.QSpacerItem(181, 21, QtWidgets.QSizePolicy.Minimum, QtWidgets.QSizePolicy.Expanding)
+        self.vboxlayout.addItem(spacerItem)
 
         self.retranslateUi(AdvancedOptionsPage)
         QtCore.QMetaObject.connectSlotsByName(AdvancedOptionsPage)
diff --git a/picard/ui/ui_provider_options_caa.py b/picard/ui/ui_provider_options_caa.py
index 6cef2f899..2143a1d20 100644
--- a/picard/ui/ui_provider_options_caa.py
+++ b/picard/ui/ui_provider_options_caa.py
@@ -31,9 +31,14 @@ class Ui_CaaOptions(object):
         self.horizontalLayout = QtWidgets.QHBoxLayout()
         self.horizontalLayout.setObjectName("horizontalLayout")
         self.label = QtWidgets.QLabel(CaaOptions)
+        sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Preferred)
+        sizePolicy.setHorizontalStretch(0)
+        sizePolicy.setVerticalStretch(0)
+        sizePolicy.setHeightForWidth(self.label.sizePolicy().hasHeightForWidth())
+        self.label.setSizePolicy(sizePolicy)
         self.label.setObjectName("label")
         self.horizontalLayout.addWidget(self.label)
-        spacerItem1 = QtWidgets.QSpacerItem(40, 20, QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Minimum)
+        spacerItem1 = QtWidgets.QSpacerItem(40, 20, QtWidgets.QSizePolicy.Ignored, QtWidgets.QSizePolicy.Minimum)
         self.horizontalLayout.addItem(spacerItem1)
         self.cb_image_size = QtWidgets.QComboBox(CaaOptions)
         sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Preferred, QtWidgets.QSizePolicy.Fixed)
diff --git a/ui/options_advanced.ui b/ui/options_advanced.ui
index 7c146efd0..c82fc3256 100644
--- a/ui/options_advanced.ui
+++ b/ui/options_advanced.ui
@@ -44,7 +44,7 @@
            <string>Ignore track duration difference under this number of seconds</string>
           </property>
           <property name="alignment">
-           <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+           <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
           </property>
          </widget>
         </item>
@@ -76,29 +76,22 @@
           </property>
          </widget>
         </item>
-        <item>
-         <spacer name="horizontalSpacer">
-          <property name="orientation">
-           <enum>Qt::Horizontal</enum>
-          </property>
-          <property name="sizeType">
-           <enum>QSizePolicy::Expanding</enum>
-          </property>
-          <property name="sizeHint" stdset="0">
-           <size>
-            <width>4000</width>
-            <height>20</height>
-           </size>
-          </property>
-         </spacer>
-        </item>
        </layout>
       </item>
       <item row="1" column="0">
        <widget class="QLabel" name="label_ignore_regex">
+        <property name="sizePolicy">
+         <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
+          <horstretch>0</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
+        </property>
         <property name="text">
          <string>Ignore file paths matching the following regular expression:</string>
         </property>
+        <property name="wordWrap">
+         <bool>true</bool>
+        </property>
        </widget>
       </item>
       <item row="3" column="0">
diff --git a/ui/provider_options_caa.ui b/ui/provider_options_caa.ui
index 94888682b..118e5d35e 100644
--- a/ui/provider_options_caa.ui
+++ b/ui/provider_options_caa.ui
@@ -58,6 +58,12 @@
     <layout class="QHBoxLayout" name="horizontalLayout">
      <item>
       <widget class="QLabel" name="label">
+       <property name="sizePolicy">
+        <sizepolicy hsizetype="Expanding" vsizetype="Preferred">
+         <horstretch>0</horstretch>
+         <verstretch>0</verstretch>
+        </sizepolicy>
+       </property>
        <property name="text">
         <string>Only use images of the following size:</string>
        </property>
@@ -68,6 +74,9 @@
        <property name="orientation">
         <enum>Qt::Horizontal</enum>
        </property>
+       <property name="sizeType">
+        <enum>QSizePolicy::Ignored</enum>
+       </property>
        <property name="sizeHint" stdset="0">
         <size>
          <width>40</width>