diff --git a/plugins/execute/nativeappconfig.ui b/plugins/execute/nativeappconfig.ui
index d4a9e7c14..b321908c9 100644
--- a/plugins/execute/nativeappconfig.ui
+++ b/plugins/execute/nativeappconfig.ui
@@ -1,436 +1,429 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ui version="4.0">
  <class>NativeAppPage</class>
  <widget class="QWidget" name="NativeAppPage">
   <property name="geometry">
    <rect>
     <x>0</x>
     <y>0</y>
     <width>511</width>
     <height>580</height>
    </rect>
   </property>
   <layout class="QVBoxLayout" name="verticalLayout">
    <item>
     <widget class="QGroupBox" name="groupBox">
      <property name="title">
       <string>Executable</string>
      </property>
      <layout class="QFormLayout" name="formLayout_2">
       <item row="0" column="0">
        <widget class="QLabel" name="label">
         <property name="text">
          <string>Project &amp;Target:</string>
         </property>
         <property name="buddy">
          <cstring>projectTargetRadio</cstring>
         </property>
        </widget>
       </item>
       <item row="0" column="1">
        <layout class="QHBoxLayout" name="horizontalLayout_2">
         <item>
          <widget class="QRadioButton" name="projectTargetRadio">
           <property name="sizePolicy">
            <sizepolicy hsizetype="Minimum" vsizetype="Fixed">
             <horstretch>0</horstretch>
             <verstretch>0</verstretch>
            </sizepolicy>
           </property>
           <property name="text">
            <string/>
           </property>
           <property name="checked">
            <bool>true</bool>
           </property>
          </widget>
         </item>
         <item>
          <widget class="ProjectTargetsComboBox" name="projectTarget">
           <property name="sizePolicy">
            <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
             <horstretch>0</horstretch>
             <verstretch>0</verstretch>
            </sizepolicy>
           </property>
          </widget>
         </item>
        </layout>
       </item>
       <item row="1" column="0">
        <widget class="QLabel" name="label_2">
         <property name="text">
          <string>E&amp;xecutable:</string>
         </property>
         <property name="buddy">
          <cstring>executableRadio</cstring>
         </property>
        </widget>
       </item>
       <item row="1" column="1">
        <layout class="QHBoxLayout" name="horizontalLayout_3">
         <item>
          <widget class="QRadioButton" name="executableRadio">
           <property name="enabled">
            <bool>true</bool>
           </property>
           <property name="text">
            <string/>
           </property>
          </widget>
         </item>
         <item>
          <widget class="KUrlRequester" name="executablePath">
           <property name="enabled">
            <bool>false</bool>
           </property>
           <property name="placeholderText">
            <string>Enter the executable name or absolute path to an executable file</string>
           </property>
          </widget>
         </item>
        </layout>
       </item>
      </layout>
     </widget>
    </item>
    <item>
     <widget class="QGroupBox" name="groupBox_2">
      <property name="title">
       <string>Behavior</string>
      </property>
      <layout class="QFormLayout" name="formLayout">
       <property name="fieldGrowthPolicy">
        <enum>QFormLayout::ExpandingFieldsGrow</enum>
       </property>
       <item row="0" column="0">
        <widget class="QLabel" name="label_3">
         <property name="text">
          <string>Ar&amp;guments:</string>
         </property>
         <property name="buddy">
          <cstring>arguments</cstring>
         </property>
        </widget>
       </item>
       <item row="0" column="1">
        <widget class="QLineEdit" name="arguments">
         <property name="toolTip">
          <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Enter arguments to give to the executable.&lt;br/&gt;You can pass arguments containing space characters by putting them in double-quotes.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
         </property>
         <property name="placeholderText">
          <string>Enter arguments to give to the executable</string>
         </property>
        </widget>
       </item>
       <item row="1" column="0">
        <widget class="QLabel" name="label_4">
         <property name="text">
          <string>Working &amp;Directory:</string>
         </property>
         <property name="buddy">
          <cstring>workingDirectory</cstring>
         </property>
        </widget>
       </item>
       <item row="1" column="1">
        <widget class="KUrlRequester" name="workingDirectory">
         <property name="toolTip">
          <string>Select a working directory for the executable</string>
         </property>
         <property name="placeholderText">
          <string>Select a working directory for the executable</string>
         </property>
        </widget>
       </item>
       <item row="2" column="0">
        <widget class="QLabel" name="label_5">
         <property name="text">
          <string>E&amp;nvironment:</string>
         </property>
         <property name="buddy">
          <cstring>environment</cstring>
         </property>
        </widget>
       </item>
       <item row="2" column="1">
        <layout class="QHBoxLayout" name="horizontalLayout">
         <item>
          <widget class="KDevelop::EnvironmentSelectionWidget" name="environment">
           <property name="sizePolicy">
            <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
             <horstretch>0</horstretch>
             <verstretch>0</verstretch>
            </sizepolicy>
           </property>
           <property name="toolTip">
            <string>Select an environment to be used</string>
           </property>
          </widget>
         </item>
         <item>
          <widget class="KDevelop::EnvironmentConfigureButton" name="configureEnvironment"/>
         </item>
        </layout>
       </item>
       <item row="3" column="0">
        <layout class="QHBoxLayout" name="horizontalLayout_4">
         <item>
          <spacer name="horizontalSpacer">
           <property name="orientation">
            <enum>Qt::Horizontal</enum>
           </property>
           <property name="sizeHint" stdset="0">
            <size>
             <width>12</width>
             <height>20</height>
            </size>
           </property>
          </spacer>
         </item>
         <item>
          <widget class="QCheckBox" name="runInTerminal">
           <property name="toolTip">
            <string>&lt;p&gt;By default applications will be run in the background and only their output will be displayed in a toolview. This makes it impossible to interact with applications requiring user input from a terminal emulator. To run such applications, you should use an external terminal.&lt;/p&gt;</string>
           </property>
           <property name="text">
            <string>Use External Terminal:</string>
           </property>
          </widget>
         </item>
        </layout>
       </item>
       <item row="3" column="1">
        <widget class="KComboBox" name="terminal">
         <property name="enabled">
          <bool>false</bool>
         </property>
         <property name="sizePolicy">
          <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
           <horstretch>0</horstretch>
           <verstretch>0</verstretch>
          </sizepolicy>
         </property>
         <property name="toolTip">
          <string>&lt;p&gt;Defines the command to execute the external terminal emulator. Use the following placeholders:&lt;/p&gt;
 &lt;dl&gt;
 &lt;dt&gt;&lt;code&gt;%exe&lt;/code&gt;&lt;/dt&gt;
 &lt;dd&gt;The path to the executable selected above.&lt;/dd&gt;
 &lt;dt&gt;&lt;code&gt;%workdir&lt;/code&gt;&lt;/dt&gt;
 &lt;dd&gt;The path to the working directory selected above.&lt;/dd&gt;
 &lt;/dl&gt;
 &lt;p&gt;The arguments defined above will get appended to this command.&lt;/p&gt;</string>
         </property>
         <property name="editable">
          <bool>true</bool>
         </property>
         <item>
          <property name="text">
           <string notr="true">konsole --noclose --workdir %workdir -e %exe</string>
          </property>
         </item>
         <item>
          <property name="text">
           <string notr="true">xterm -hold -e %exe</string>
          </property>
         </item>
         <item>
          <property name="text">
           <string notr="true">gnome-terminal -e %exe</string>
          </property>
         </item>
        </widget>
       </item>
      </layout>
     </widget>
    </item>
    <item>
     <widget class="QGroupBox" name="groupBox_3">
      <property name="title">
       <string>Dependencies</string>
      </property>
      <layout class="QFormLayout" name="formLayout_3">
       <item row="0" column="0">
        <widget class="QLabel" name="label_8">
         <property name="text">
          <string>Act&amp;ion:</string>
         </property>
         <property name="buddy">
          <cstring>dependencyAction</cstring>
         </property>
        </widget>
       </item>
       <item row="0" column="1">
        <widget class="KComboBox" name="dependencyAction">
         <property name="toolTip">
          <string>Specifies the action to take for the dependencies before starting the executable.</string>
         </property>
         <property name="whatsThis">
          <string>The selected action will be run before the executable is started.  This allows there to be parts of a project, upon which the executable does not directly depend, to be built and/or installed before running the application.</string>
         </property>
         <property name="frame">
          <bool>true</bool>
         </property>
         <item>
          <property name="text">
           <string>Do Nothing</string>
          </property>
         </item>
         <item>
          <property name="text">
           <string comment="@action">Build</string>
          </property>
         </item>
         <item>
          <property name="text">
           <string comment="@action">Build and Install</string>
          </property>
         </item>
        </widget>
       </item>
       <item row="1" column="0">
        <widget class="QLabel" name="label_7">
         <property name="text">
          <string>Targets:</string>
         </property>
        </widget>
       </item>
       <item row="1" column="1">
-       <widget class="KDevelop::DependenciesWidget" name="dependencies" native="true">
-        <property name="sizePolicy">
-         <sizepolicy hsizetype="MinimumExpanding" vsizetype="MinimumExpanding">
-          <horstretch>0</horstretch>
-          <verstretch>0</verstretch>
-         </sizepolicy>
-        </property>
-       </widget>
+       <widget class="KDevelop::DependenciesWidget" name="dependencies" native="true"/>
       </item>
      </layout>
     </widget>
    </item>
   </layout>
  </widget>
  <customwidgets>
   <customwidget>
    <class>KUrlRequester</class>
    <extends>QWidget</extends>
    <header>kurlrequester.h</header>
    <container>1</container>
   </customwidget>
   <customwidget>
    <class>KComboBox</class>
    <extends>QComboBox</extends>
    <header>kcombobox.h</header>
   </customwidget>
   <customwidget>
    <class>KDevelop::EnvironmentSelectionWidget</class>
    <extends>KComboBox</extends>
    <header>util/environmentselectionwidget.h</header>
   </customwidget>
   <customwidget>
    <class>ProjectTargetsComboBox</class>
    <extends>QComboBox</extends>
    <header>projecttargetscombobox.h</header>
   </customwidget>
   <customwidget>
    <class>KDevelop::EnvironmentConfigureButton</class>
    <extends>QToolButton</extends>
    <header>shell/environmentconfigurebutton.h</header>
   </customwidget>
   <customwidget>
    <class>KDevelop::DependenciesWidget</class>
    <extends>QWidget</extends>
    <header>project/widgets/dependencieswidget.h</header>
    <container>1</container>
   </customwidget>
  </customwidgets>
  <tabstops>
   <tabstop>executablePath</tabstop>
   <tabstop>arguments</tabstop>
   <tabstop>workingDirectory</tabstop>
   <tabstop>environment</tabstop>
  </tabstops>
  <resources/>
  <connections>
   <connection>
    <sender>projectTargetRadio</sender>
    <signal>toggled(bool)</signal>
    <receiver>executablePath</receiver>
    <slot>setDisabled(bool)</slot>
    <hints>
     <hint type="sourcelabel">
      <x>124</x>
      <y>55</y>
     </hint>
     <hint type="destinationlabel">
      <x>497</x>
      <y>85</y>
     </hint>
    </hints>
   </connection>
   <connection>
    <sender>executableRadio</sender>
    <signal>toggled(bool)</signal>
    <receiver>executablePath</receiver>
    <slot>setEnabled(bool)</slot>
    <hints>
     <hint type="sourcelabel">
      <x>124</x>
      <y>83</y>
     </hint>
     <hint type="destinationlabel">
      <x>497</x>
      <y>85</y>
     </hint>
    </hints>
   </connection>
   <connection>
    <sender>runInTerminal</sender>
    <signal>toggled(bool)</signal>
    <receiver>terminal</receiver>
    <slot>setEnabled(bool)</slot>
    <hints>
     <hint type="sourcelabel">
      <x>136</x>
      <y>227</y>
     </hint>
     <hint type="destinationlabel">
      <x>206</x>
      <y>226</y>
     </hint>
    </hints>
   </connection>
   <connection>
    <sender>projectTargetRadio</sender>
    <signal>toggled(bool)</signal>
    <receiver>projectTarget</receiver>
    <slot>setEnabled(bool)</slot>
    <hints>
     <hint type="sourcelabel">
      <x>108</x>
      <y>34</y>
     </hint>
     <hint type="destinationlabel">
      <x>152</x>
      <y>38</y>
     </hint>
    </hints>
   </connection>
   <connection>
    <sender>executableRadio</sender>
    <signal>toggled(bool)</signal>
    <receiver>projectTarget</receiver>
    <slot>setDisabled(bool)</slot>
    <hints>
     <hint type="sourcelabel">
      <x>106</x>
      <y>73</y>
     </hint>
     <hint type="destinationlabel">
      <x>310</x>
      <y>45</y>
     </hint>
    </hints>
   </connection>
  </connections>
 </ui>
diff --git a/plugins/filetemplates/templatepreviewtoolview.ui b/plugins/filetemplates/templatepreviewtoolview.ui
index 68825ea88..6dfab88b6 100644
--- a/plugins/filetemplates/templatepreviewtoolview.ui
+++ b/plugins/filetemplates/templatepreviewtoolview.ui
@@ -1,168 +1,168 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ui version="4.0">
  <class>TemplatePreviewToolView</class>
  <widget class="QWidget" name="TemplatePreviewToolView">
   <property name="geometry">
    <rect>
     <x>0</x>
     <y>0</y>
     <width>686</width>
     <height>571</height>
    </rect>
   </property>
   <layout class="QVBoxLayout" name="verticalLayout">
    <item>
     <widget class="KMessageWidget" name="messageWidget" native="true"/>
    </item>
    <item>
     <widget class="TemplatePreview" name="preview" native="true"/>
    </item>
    <item>
     <widget class="QGroupBox" name="groupBox_2">
      <property name="title">
       <string>Template type</string>
      </property>
      <property name="flat">
       <bool>true</bool>
      </property>
      <layout class="QVBoxLayout" name="verticalLayout_2">
       <item>
        <widget class="QRadioButton" name="projectRadioButton">
         <property name="text">
          <string>Project template</string>
         </property>
         <property name="checked">
          <bool>true</bool>
         </property>
        </widget>
       </item>
       <item>
        <widget class="QRadioButton" name="classRadioButton">
         <property name="text">
          <string>Class template</string>
         </property>
        </widget>
       </item>
       <item>
        <layout class="QHBoxLayout" name="horizontalLayout">
         <item>
          <spacer name="horizontalSpacer">
           <property name="orientation">
            <enum>Qt::Horizontal</enum>
           </property>
           <property name="sizeType">
            <enum>QSizePolicy::Maximum</enum>
           </property>
           <property name="sizeHint" stdset="0">
            <size>
             <width>40</width>
             <height>20</height>
            </size>
           </property>
          </spacer>
         </item>
         <item>
          <widget class="QLabel" name="emptyLinesPolicyLabel">
           <property name="enabled">
            <bool>false</bool>
           </property>
           <property name="text">
            <string>&amp;Empty lines policy</string>
           </property>
           <property name="buddy">
            <cstring>emptyLinesPolicyComboBox</cstring>
           </property>
          </widget>
         </item>
         <item>
          <widget class="QComboBox" name="emptyLinesPolicyComboBox">
           <property name="enabled">
            <bool>false</bool>
           </property>
           <item>
            <property name="text">
             <string>Keep empty lines</string>
            </property>
           </item>
           <item>
            <property name="text">
             <string>Remove repeated empty lines</string>
            </property>
           </item>
           <item>
            <property name="text">
             <string>Remove all empty lines</string>
            </property>
           </item>
          </widget>
         </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>
   </layout>
  </widget>
  <customwidgets>
   <customwidget>
    <class>KMessageWidget</class>
-   <extends>QWidget</extends>
+   <extends>QFrame</extends>
    <header>kmessagewidget.h</header>
    <container>1</container>
   </customwidget>
   <customwidget>
    <class>TemplatePreview</class>
    <extends>QWidget</extends>
    <header>templatepreview.h</header>
    <container>1</container>
   </customwidget>
  </customwidgets>
  <resources/>
  <connections>
   <connection>
    <sender>classRadioButton</sender>
    <signal>toggled(bool)</signal>
    <receiver>emptyLinesPolicyComboBox</receiver>
    <slot>setEnabled(bool)</slot>
    <hints>
     <hint type="sourcelabel">
      <x>76</x>
      <y>69</y>
     </hint>
     <hint type="destinationlabel">
      <x>171</x>
      <y>100</y>
     </hint>
    </hints>
   </connection>
   <connection>
    <sender>classRadioButton</sender>
    <signal>toggled(bool)</signal>
    <receiver>emptyLinesPolicyLabel</receiver>
    <slot>setEnabled(bool)</slot>
    <hints>
     <hint type="sourcelabel">
      <x>55</x>
      <y>70</y>
     </hint>
     <hint type="destinationlabel">
      <x>55</x>
      <y>101</y>
     </hint>
    </hints>
   </connection>
  </connections>
 </ui>
diff --git a/plugins/filetemplates/ui/outputlocation.ui b/plugins/filetemplates/ui/outputlocation.ui
index 198120369..84c32e83d 100644
--- a/plugins/filetemplates/ui/outputlocation.ui
+++ b/plugins/filetemplates/ui/outputlocation.ui
@@ -1,101 +1,101 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ui version="4.0">
  <class>OutputLocationDialog</class>
  <widget class="QWidget" name="OutputLocationDialog">
   <property name="geometry">
    <rect>
     <x>0</x>
     <y>0</y>
     <width>448</width>
     <height>250</height>
    </rect>
   </property>
   <layout class="QVBoxLayout" name="verticalLayout">
    <item>
     <widget class="QGroupBox" name="groupBox_3">
      <property name="title">
       <string>Choose where to save the new class.</string>
      </property>
      <layout class="QGridLayout" name="gridLayout_3">
       <item row="1" column="0">
        <widget class="QGroupBox" name="positionGroupBox">
         <property name="enabled">
          <bool>true</bool>
         </property>
         <property name="title">
          <string>Location within existing file(s)</string>
         </property>
         <property name="flat">
          <bool>true</bool>
         </property>
         <layout class="QVBoxLayout" name="verticalLayout_2">
          <item>
           <layout class="QFormLayout" name="positionFormLayout"/>
          </item>
         </layout>
        </widget>
       </item>
       <item row="0" column="0">
        <widget class="QGroupBox" name="urlGroupBox">
         <property name="title">
          <string>Output file(s)</string>
         </property>
         <property name="flat">
          <bool>true</bool>
         </property>
         <property name="checkable">
          <bool>false</bool>
         </property>
         <layout class="QVBoxLayout" name="verticalLayout_3">
          <item>
           <widget class="QCheckBox" name="lowerFilenameCheckBox">
            <property name="text">
             <string>Lower case file names</string>
            </property>
            <property name="checked">
             <bool>true</bool>
            </property>
           </widget>
          </item>
          <item>
           <widget class="KMessageWidget" name="messageWidget" native="true"/>
          </item>
          <item>
           <layout class="QFormLayout" name="urlFormLayout">
            <property name="fieldGrowthPolicy">
             <enum>QFormLayout::ExpandingFieldsGrow</enum>
            </property>
           </layout>
          </item>
         </layout>
        </widget>
       </item>
      </layout>
     </widget>
    </item>
    <item>
     <spacer name="verticalSpacer">
      <property name="orientation">
       <enum>Qt::Vertical</enum>
      </property>
      <property name="sizeHint" stdset="0">
       <size>
        <width>20</width>
        <height>5</height>
       </size>
      </property>
     </spacer>
    </item>
   </layout>
  </widget>
  <customwidgets>
   <customwidget>
    <class>KMessageWidget</class>
-   <extends>QWidget</extends>
+   <extends>QFrame</extends>
    <header location="global">kmessagewidget.h</header>
    <container>1</container>
   </customwidget>
  </customwidgets>
  <resources/>
  <connections/>
 </ui>
diff --git a/plugins/filetemplates/ui/overridevirtuals.ui b/plugins/filetemplates/ui/overridevirtuals.ui
index 7cb140267..84477194e 100644
--- a/plugins/filetemplates/ui/overridevirtuals.ui
+++ b/plugins/filetemplates/ui/overridevirtuals.ui
@@ -1,104 +1,85 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ui version="4.0">
  <class>OverridesDialog</class>
  <widget class="QWidget" name="OverridesDialog">
   <property name="geometry">
    <rect>
     <x>0</x>
     <y>0</y>
     <width>720</width>
     <height>531</height>
    </rect>
   </property>
   <layout class="QVBoxLayout" name="verticalLayout_2">
-   <property name="leftMargin">
-    <number>0</number>
-   </property>
-   <property name="rightMargin">
+   <property name="margin">
     <number>0</number>
    </property>
    <item>
     <widget class="QGroupBox" name="groupBox">
      <property name="title">
       <string>Select any methods you would like to override in the new class.</string>
      </property>
      <layout class="QVBoxLayout" name="verticalLayout_3">
-      <property name="leftMargin">
-       <number>0</number>
-      </property>
-      <property name="rightMargin">
-       <number>0</number>
-      </property>
-      <property name="bottomMargin">
-       <number>0</number>
-      </property>
       <item>
        <widget class="QTreeWidget" name="overridesTree">
         <property name="rootIsDecorated">
          <bool>false</bool>
         </property>
         <property name="uniformRowHeights">
          <bool>false</bool>
         </property>
         <property name="itemsExpandable">
          <bool>false</bool>
         </property>
         <property name="allColumnsShowFocus">
          <bool>true</bool>
         </property>
         <property name="expandsOnDoubleClick">
          <bool>false</bool>
         </property>
         <column>
          <property name="text">
           <string>Superclass -&gt; Function</string>
          </property>
         </column>
         <column>
          <property name="text">
           <string>Access</string>
          </property>
         </column>
         <column>
          <property name="text">
           <string>Properties</string>
          </property>
         </column>
        </widget>
       </item>
       <item>
        <layout class="QHBoxLayout" name="horizontalLayout">
         <item>
          <widget class="QPushButton" name="selectAllPushButton">
           <property name="text">
            <string>Select &amp;All</string>
           </property>
          </widget>
         </item>
         <item>
          <widget class="QPushButton" name="deselectAllPushButton">
           <property name="text">
            <string>&amp;Deselect All</string>
           </property>
          </widget>
         </item>
         <item>
          <widget class="QWidget" name="extraFunctionWidget" native="true"/>
         </item>
        </layout>
       </item>
      </layout>
     </widget>
    </item>
   </layout>
  </widget>
- <customwidgets>
-  <customwidget>
-   <class>QPushButton</class>
-   <extends>QPushButton</extends>
-   <header>kpushbutton.h</header>
-  </customwidget>
- </customwidgets>
  <resources/>
  <connections/>
 </ui>
diff --git a/plugins/projectfilter/projectfiltersettings.ui b/plugins/projectfilter/projectfiltersettings.ui
index 383e18fbf..40e35ad8d 100644
--- a/plugins/projectfilter/projectfiltersettings.ui
+++ b/plugins/projectfilter/projectfiltersettings.ui
@@ -1,114 +1,114 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ui version="4.0">
  <class>ProjectFilterSettings</class>
  <widget class="QWidget" name="ProjectFilterSettings">
   <property name="geometry">
    <rect>
     <x>0</x>
     <y>0</y>
     <width>696</width>
     <height>400</height>
    </rect>
   </property>
   <layout class="QVBoxLayout" name="verticalLayout_2">
    <property name="margin">
     <number>0</number>
    </property>
    <item>
     <widget class="QLabel" name="label">
      <property name="text">
       <string>Configure which files and folders inside the project folder should be included or excluded:</string>
      </property>
     </widget>
    </item>
    <item>
     <layout class="QHBoxLayout" name="horizontalLayout">
      <item>
       <widget class="QTreeView" name="filters"/>
      </item>
      <item>
       <layout class="QVBoxLayout" name="verticalLayout">
        <item>
         <widget class="QPushButton" name="add">
          <property name="text">
           <string>Add</string>
          </property>
          <property name="icon">
           <iconset theme="list-add">
            <normaloff/>
           </iconset>
          </property>
          <property name="default">
           <bool>true</bool>
          </property>
         </widget>
        </item>
        <item>
         <widget class="QPushButton" name="remove">
          <property name="text">
           <string>Remove</string>
          </property>
          <property name="icon">
           <iconset theme="list-remove">
            <normaloff/>
           </iconset>
          </property>
         </widget>
        </item>
        <item>
         <widget class="QPushButton" name="moveUp">
          <property name="text">
           <string>Move Up</string>
          </property>
          <property name="icon">
           <iconset theme="arrow-up">
            <normaloff/>
           </iconset>
          </property>
         </widget>
        </item>
        <item>
         <widget class="QPushButton" name="moveDown">
          <property name="text">
           <string>Move Down</string>
          </property>
          <property name="icon">
           <iconset theme="arrow-down">
            <normaloff/>
           </iconset>
          </property>
         </widget>
        </item>
        <item>
         <spacer name="verticalSpacer">
          <property name="orientation">
           <enum>Qt::Vertical</enum>
          </property>
          <property name="sizeHint" stdset="0">
           <size>
            <width>20</width>
            <height>40</height>
           </size>
          </property>
         </spacer>
        </item>
       </layout>
      </item>
     </layout>
    </item>
    <item>
     <widget class="KMessageWidget" name="messageWidget" native="true"/>
    </item>
   </layout>
  </widget>
  <customwidgets>
   <customwidget>
    <class>KMessageWidget</class>
-   <extends>QWidget</extends>
+   <extends>QFrame</extends>
    <header location="global">kmessagewidget.h</header>
    <container>1</container>
   </customwidget>
  </customwidgets>
  <resources/>
  <connections/>
 </ui>
diff --git a/project/widgets/dependencieswidget.ui b/project/widgets/dependencieswidget.ui
index b6c68a174..aa8312762 100644
--- a/project/widgets/dependencieswidget.ui
+++ b/project/widgets/dependencieswidget.ui
@@ -1,153 +1,153 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ui version="4.0">
  <class>DependenciesWidget</class>
  <widget class="QWidget" name="DependenciesWidget">
   <property name="geometry">
    <rect>
     <x>0</x>
     <y>0</y>
     <width>400</width>
     <height>300</height>
    </rect>
   </property>
   <layout class="QGridLayout" name="gridLayout">
    <property name="leftMargin">
     <number>0</number>
    </property>
    <property name="topMargin">
     <number>0</number>
    </property>
    <property name="rightMargin">
     <number>0</number>
    </property>
    <property name="bottomMargin">
     <number>0</number>
    </property>
    <property name="spacing">
     <number>0</number>
    </property>
    <item row="0" column="0">
     <widget class="ProjectItemLineEdit" name="targetDependency">
      <property name="toolTip">
       <string>Enter a dependency to add to the list</string>
      </property>
      <property name="placeholderText">
       <string>Enter a dependency to add to the list</string>
      </property>
      <property name="showClearButton" stdset="0">
       <bool>true</bool>
      </property>
     </widget>
    </item>
    <item row="0" column="1">
     <widget class="QPushButton" name="browseProject">
      <property name="icon">
-      <iconset theme="folder-document&lt;"/>
+      <iconset theme="folder-document"/>
      </property>
     </widget>
    </item>
    <item row="0" column="2">
     <widget class="QPushButton" name="addDependency">
      <property name="enabled">
       <bool>false</bool>
      </property>
      <property name="toolTip">
       <string>Adds the listed target to the dependency list.</string>
      </property>
      <property name="text">
       <string/>
      </property>
      <property name="icon">
       <iconset theme="list-add"/>
      </property>
     </widget>
    </item>
    <item row="1" column="0" rowspan="4" colspan="2">
     <widget class="QListWidget" name="dependencies">
      <property name="toolTip">
       <string>List of indirect dependent targets.</string>
      </property>
      <property name="whatsThis">
       <string>This list should contain targets that the application does not directly depend on, but for which an action needs to be taken before running the application.</string>
      </property>
      <property name="alternatingRowColors">
       <bool>true</bool>
      </property>
      <property name="uniformItemSizes">
       <bool>true</bool>
      </property>
     </widget>
    </item>
    <item row="1" column="2">
     <widget class="QPushButton" name="removeDependency">
      <property name="enabled">
       <bool>false</bool>
      </property>
      <property name="toolTip">
       <string>Removes the selected dependencies from the list.</string>
      </property>
      <property name="text">
       <string/>
      </property>
      <property name="icon">
       <iconset theme="list-remove"/>
      </property>
     </widget>
    </item>
    <item row="2" column="2">
     <widget class="QPushButton" name="moveDepUp">
      <property name="enabled">
       <bool>false</bool>
      </property>
      <property name="toolTip">
       <string>Moves the selected dependency up in the list.</string>
      </property>
      <property name="text">
       <string/>
      </property>
      <property name="icon">
       <iconset theme="go-up"/>
      </property>
     </widget>
    </item>
    <item row="3" column="2">
     <widget class="QPushButton" name="moveDepDown">
      <property name="enabled">
       <bool>false</bool>
      </property>
      <property name="toolTip">
       <string>Moves the selected dependency down in the list.</string>
      </property>
      <property name="text">
       <string/>
      </property>
      <property name="icon">
       <iconset theme="go-down"/>
      </property>
     </widget>
    </item>
    <item row="4" column="2">
     <spacer name="verticalSpacer">
      <property name="orientation">
       <enum>Qt::Vertical</enum>
      </property>
      <property name="sizeHint" stdset="0">
       <size>
        <width>20</width>
        <height>151</height>
       </size>
      </property>
     </spacer>
    </item>
   </layout>
  </widget>
  <customwidgets>
   <customwidget>
    <class>ProjectItemLineEdit</class>
    <extends>QLineEdit</extends>
    <header>project/projectitemlineedit.h</header>
   </customwidget>
  </customwidgets>
  <resources/>
  <connections/>
 </ui>