diff --git a/src/config/clangtidypreferences.ui b/src/config/clangtidypreferences.ui
index 22f9e8f846..4500a31ca3 100644
--- a/src/config/clangtidypreferences.ui
+++ b/src/config/clangtidypreferences.ui
@@ -1,75 +1,75 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ui version="4.0">
  <class>ClangTidyPreferences</class>
  <widget class="QWidget" name="ClangTidyPreferences">
   <property name="geometry">
    <rect>
     <x>0</x>
     <y>0</y>
     <width>400</width>
     <height>300</height>
    </rect>
   </property>
   <property name="windowTitle">
    <string>Clang-Tidy Settings</string>
   </property>
   <layout class="QVBoxLayout" name="settingsLayout">
    <item>
     <widget class="QGroupBox" name="pathsGroupBox">
      <property name="title">
       <string>Paths</string>
      </property>
      <layout class="QHBoxLayout" name="pathsGroupBoxLayout">
       <item>
        <layout class="QVBoxLayout" name="pathsLabelsLayout">
         <item>
          <widget class="QLabel" name="clangtidyLabel">
           <property name="text">
-           <string>Clang-&amp;tidy executable</string>
+           <string>Clang-&amp;tidy executable:</string>
           </property>
           <property name="alignment">
            <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
           </property>
           <property name="buddy">
            <cstring>kcfg_clangtidyPath</cstring>
           </property>
          </widget>
         </item>
        </layout>
       </item>
       <item>
        <layout class="QVBoxLayout" name="pathsUrlsLayout">
         <item>
          <widget class="KUrlRequester" name="kcfg_clangtidyPath"/>
         </item>
        </layout>
       </item>
      </layout>
     </widget>
    </item>
    <item>
     <spacer name="settingsSpacer">
      <property name="orientation">
       <enum>Qt::Vertical</enum>
      </property>
      <property name="sizeHint" stdset="0">
       <size>
        <width>20</width>
        <height>186</height>
       </size>
      </property>
     </spacer>
    </item>
   </layout>
  </widget>
  <customwidgets>
   <customwidget>
    <class>KUrlRequester</class>
    <extends>QFrame</extends>
    <header>kurlrequester.h</header>
    <container>1</container>
   </customwidget>
  </customwidgets>
  <resources/>
  <connections/>
 </ui>
diff --git a/src/config/perprojectconfig.ui b/src/config/perprojectconfig.ui
index 8e0d6a055c..298da57da7 100644
--- a/src/config/perprojectconfig.ui
+++ b/src/config/perprojectconfig.ui
@@ -1,112 +1,116 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ui version="4.0">
  <class>ClangTidy::PerProjectConfig</class>
  <widget class="QWidget" name="ClangTidy::PerProjectConfig">
   <property name="geometry">
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>567</width>
-    <height>461</height>
+    <width>574</width>
+    <height>379</height>
    </rect>
   </property>
-  <layout class="QGridLayout" name="gridLayout_2">
-   <item row="5" column="0" colspan="2">
+  <layout class="QVBoxLayout" name="verticalLayout">
+   <item>
+    <layout class="QFormLayout" name="formLayout">
+     <item row="0" column="0">
+      <widget class="QLabel" name="label">
+       <property name="text">
+        <string>Header filter regex:</string>
+       </property>
+      </widget>
+     </item>
+     <item row="0" column="1">
+      <widget class="QLineEdit" name="headerFilterText">
+       <property name="toolTip">
+        <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Regular expression matching the names of the headers to output diagnostics from. Diagnostics from the main file of each translation unit are always displayed. Can be used together with -line-filter. This option overrides the value read from a .clang-tidy file.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+       </property>
+      </widget>
+     </item>
+     <item row="1" column="0">
+      <widget class="QLabel" name="label_3">
+       <property name="text">
+        <string>E&amp;xtra parameters:</string>
+       </property>
+       <property name="buddy">
+        <cstring>clangtidyParameters</cstring>
+       </property>
+      </widget>
+     </item>
+     <item row="1" column="1">
+      <widget class="QLineEdit" name="clangtidyParameters">
+       <property name="toolTip">
+        <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Additional command line options to pass to clang-tidy.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+       </property>
+      </widget>
+     </item>
+     <item row="2" column="1">
+      <widget class="QCheckBox" name="sysHeadersCheckBox">
+       <property name="text">
+        <string>Check system headers</string>
+       </property>
+      </widget>
+     </item>
+     <item row="3" column="1">
+      <widget class="QCheckBox" name="overrideConfigFileCheckBox">
+       <property name="text">
+        <string>Override .clang-tidy file options</string>
+       </property>
+      </widget>
+     </item>
+    </layout>
+   </item>
+   <item>
     <widget class="QGroupBox" name="checkListGroupBox">
      <property name="toolTip">
       <string>Enable additional checks</string>
      </property>
      <property name="title">
       <string>Available checks </string>
      </property>
      <layout class="QGridLayout" name="gridLayout">
       <item row="0" column="0">
        <widget class="QListView" name="checkListView">
         <property name="editTriggers">
          <set>QAbstractItemView::NoEditTriggers</set>
         </property>
         <property name="selectionMode">
          <enum>QAbstractItemView::ExtendedSelection</enum>
         </property>
         <property name="resizeMode">
          <enum>QListView::Adjust</enum>
         </property>
        </widget>
       </item>
       <item row="1" column="0">
        <widget class="QCheckBox" name="dumpCheckBox">
         <property name="text">
-         <string>Dump active configuration to .clang-tidy file.</string>
+         <string>Dump active configuration to .clang-tidy file</string>
         </property>
        </widget>
       </item>
      </layout>
     </widget>
    </item>
-   <item row="1" column="1">
-    <widget class="QLineEdit" name="clangtidyParameters">
-     <property name="toolTip">
-      <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Additional command line options to pass to clang-tidy.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
-     </property>
-    </widget>
-   </item>
-   <item row="1" column="0">
-    <widget class="QLabel" name="label_3">
-     <property name="text">
-      <string>Extra &amp;Parameters:</string>
-     </property>
-     <property name="buddy">
-      <cstring>clangtidyParameters</cstring>
-     </property>
-    </widget>
-   </item>
-   <item row="0" column="1">
-    <widget class="QLineEdit" name="headerFilterText">
-     <property name="toolTip">
-      <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Regular expression matching the names of the headers to output diagnostics from. Diagnostics from the main file of each translation unit are always displayed. Can be used together with -line-filter. This option overrides the value read from a .clang-tidy file.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
-     </property>
-    </widget>
-   </item>
-   <item row="4" column="0">
-    <widget class="QCheckBox" name="sysHeadersCheckBox">
-     <property name="text">
-      <string>Check system headers</string>
-     </property>
-    </widget>
-   </item>
-   <item row="4" column="1">
-    <widget class="QCheckBox" name="overrideConfigFileCheckBox">
-     <property name="text">
-      <string>Override .clang-tidy file options</string>
-     </property>
-    </widget>
-   </item>
-   <item row="0" column="0">
-    <widget class="QLabel" name="label">
-     <property name="text">
-      <string>Header Filter regex</string>
-     </property>
-    </widget>
-   </item>
   </layout>
  </widget>
  <resources/>
  <connections>
   <connection>
    <sender>overrideConfigFileCheckBox</sender>
    <signal>clicked(bool)</signal>
    <receiver>checkListGroupBox</receiver>
    <slot>setEnabled(bool)</slot>
    <hints>
     <hint type="sourcelabel">
      <x>194</x>
      <y>85</y>
     </hint>
     <hint type="destinationlabel">
      <x>102</x>
      <y>109</y>
     </hint>
    </hints>
   </connection>
  </connections>
 </ui>