diff --git a/kcms/colors/colorsettings.ui b/kcms/colors/colorsettings.ui
index 9a8f671fc..65dc32f27 100644
--- a/kcms/colors/colorsettings.ui
+++ b/kcms/colors/colorsettings.ui
@@ -1,143 +1,158 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ui version="4.0">
  <class>colorSettings</class>
  <widget class="QWidget" name="colorSettings">
   <property name="geometry">
    <rect>
     <x>0</x>
     <y>0</y>
     <width>736</width>
     <height>422</height>
    </rect>
   </property>
   <layout class="QVBoxLayout">
    <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>
    <item>
     <layout class="QGridLayout" name="gridLayout">
-     <item row="5" column="4">
+     <item row="5" column="0">
       <widget class="QPushButton" name="schemeEditButton">
        <property name="toolTip">
         <string>Configure the current color scheme</string>
        </property>
        <property name="text">
-        <string>Edit Scheme</string>
+        <string>Edit...</string>
+       </property>
+       <property name="flat">
+        <bool>false</bool>
+       </property>
+       <property name="icon">
+        <iconset theme="edit-entry">
+         <normaloff/>
+        </iconset>
+       </property>
+      </widget>
+     </item>
+     <item row="5" column="1">
+      <widget class="QPushButton" name="schemeRemoveButton">
+       <property name="enabled">
+        <bool>false</bool>
+       </property>
+       <property name="toolTip">
+        <string>Remove the selected scheme</string>
+       </property>
+       <property name="text">
+        <string>Remove</string>
        </property>
        <property name="flat">
         <bool>false</bool>
        </property>
+       <property name="icon">
+        <iconset theme="delete">
+         <normaloff/>
+        </iconset>
+       </property>
       </widget>
      </item>
      <item row="5" column="2">
       <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>
      <item row="5" column="3">
-      <widget class="QPushButton" name="schemeRemoveButton">
-       <property name="enabled">
-        <bool>false</bool>
-       </property>
+      <widget class="QPushButton" name="schemeImportButton">
        <property name="toolTip">
-        <string>Remove the selected scheme</string>
+        <string>Import a color scheme from a file</string>
        </property>
        <property name="text">
-        <string>Remove Scheme</string>
+        <string>&amp;Install from File...</string>
        </property>
-       <property name="flat">
-        <bool>false</bool>
+       <property name="icon">
+        <iconset theme="document-import">
+         <normaloff/>
+        </iconset>
        </property>
       </widget>
      </item>
-     <item row="5" column="0">
+     <item row="5" column="4">
       <widget class="QPushButton" name="schemeKnsButton">
        <property name="toolTip">
         <string>Get new color schemes from the Internet</string>
        </property>
        <property name="text">
         <string>Get &amp;New Color Schemes...</string>
        </property>
       </widget>
      </item>
      <item row="2" column="0" colspan="6">
       <widget class="QListWidget" name="schemeList">
        <property name="sizePolicy">
         <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
          <horstretch>0</horstretch>
          <verstretch>0</verstretch>
         </sizepolicy>
        </property>
        <property name="iconSize">
         <size>
          <width>23</width>
          <height>16</height>
         </size>
        </property>
       </widget>
      </item>
      <item row="1" column="0" colspan="6">
       <widget class="PreviewWidget" name="schemePreview" native="true">
        <property name="sizePolicy">
         <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
          <horstretch>0</horstretch>
          <verstretch>0</verstretch>
         </sizepolicy>
        </property>
       </widget>
      </item>
-     <item row="5" column="1">
-      <widget class="QPushButton" name="schemeImportButton">
-       <property name="toolTip">
-        <string>Import a color scheme from a file</string>
-       </property>
-       <property name="text">
-        <string>&amp;Install from File</string>
-       </property>
-      </widget>
-     </item>
      <item row="6" column="0" colspan="3">
       <widget class="QCheckBox" name="applyToAlien">
        <property name="mouseTracking">
         <bool>true</bool>
        </property>
        <property name="text">
         <string>Apply colors to &amp;non-Qt applications</string>
        </property>
       </widget>
      </item>
     </layout>
    </item>
   </layout>
  </widget>
  <customwidgets>
   <customwidget>
    <class>PreviewWidget</class>
    <extends>QWidget</extends>
    <header>previewwidget.h</header>
    <container>1</container>
   </customwidget>
  </customwidgets>
  <tabstops>
   <tabstop>schemeList</tabstop>
  </tabstops>
  <resources/>
  <connections/>
 </ui>
diff --git a/kcms/emoticons/emoticonslist.ui b/kcms/emoticons/emoticonslist.ui
index b38f49030..59d603c10 100644
--- a/kcms/emoticons/emoticonslist.ui
+++ b/kcms/emoticons/emoticonslist.ui
@@ -1,157 +1,170 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ui version="4.0">
  <class>EmoticonsManager</class>
  <widget class="QWidget" name="EmoticonsManager">
   <property name="geometry">
    <rect>
     <x>0</x>
     <y>0</y>
     <width>630</width>
     <height>419</height>
    </rect>
   </property>
   <property name="windowTitle">
    <string>Emoticons Manager</string>
   </property>
   <layout class="QGridLayout">
-   <item row="5" column="8">
-    <widget class="QPushButton" name="btEdit">
-     <property name="toolTip">
-      <string>Modify the selected emoticon icon or text </string>
-     </property>
-     <property name="whatsThis">
-      <string>Edit the selected emoticon to change its icon or its text</string>
-     </property>
-     <property name="text">
-      <string>Edit...</string>
-     </property>
-    </widget>
-   </item>
-   <item row="5" column="5">
-    <widget class="QPushButton" name="btAdd">
-     <property name="toolTip">
-      <string>Create a new emoticon</string>
-     </property>
-     <property name="whatsThis">
-      <string>Create a new emoticon by assigning it an icon and some text</string>
-     </property>
-     <property name="text">
-      <string>Add...</string>
-     </property>
-    </widget>
-   </item>
-   <item row="0" column="2" rowspan="2" colspan="7">
-    <widget class="QListWidget" name="emoList">
+   <item row="0" column="0" rowspan="2" colspan="2">
+    <widget class="QListWidget" name="themeList">
      <property name="iconSize">
       <size>
        <width>22</width>
        <height>22</height>
       </size>
      </property>
     </widget>
    </item>
-   <item row="0" column="0" rowspan="2" colspan="2">
-    <widget class="QListWidget" name="themeList">
+   <item row="0" column="2" rowspan="2" colspan="8">
+    <widget class="QListWidget" name="emoList">
      <property name="iconSize">
       <size>
        <width>22</width>
        <height>22</height>
       </size>
      </property>
     </widget>
    </item>
-   <item row="5" column="1">
-    <widget class="QPushButton" name="btGetNew">
-     <property name="toolTip">
-      <string>Get new icon themes from the Internet</string>
-     </property>
-     <property name="whatsThis">
-      <string>You need to be connected to the Internet to use this action. A dialog will display a list of emoticon themes from the http://www.kde-look.org website. Clicking the Install button associated with a theme will install this theme locally.</string>
-     </property>
+   <item row="2" column="0" colspan="2">
+    <widget class="QCheckBox" name="cbStrict">
      <property name="text">
-      <string>Get New Emoticons...</string>
-     </property>
-     <property name="icon">
-      <iconset theme="get-hot-new-stuff">
-       <normaloff/>
-      </iconset>
+      <string>Require spaces around emoticons</string>
      </property>
     </widget>
    </item>
    <item row="5" column="0">
-    <widget class="QPushButton" name="btInstall">
+    <widget class="QPushButton" name="btNew">
      <property name="toolTip">
-      <string>Install a theme archive file you already have locally</string>
+      <string>Design a new emoticon theme</string>
      </property>
      <property name="whatsThis">
-      <string>If you already have an emoticon theme archive locally, this button will unpack it and make it available for KDE applications</string>
-     </property>
-     <property name="text">
-      <string>Install from File</string>
+      <string>Start a new theme by assigning it a name. Then use the Add button on the right to add emoticons to this theme.</string>
      </property>
-    </widget>
-   </item>
-   <item row="2" column="0" colspan="2">
-    <widget class="QCheckBox" name="cbStrict">
      <property name="text">
-      <string>Require spaces around emoticons</string>
+      <string>New Theme</string>
      </property>
     </widget>
    </item>
-   <item row="5" column="3">
+   <item row="5" column="1">
     <widget class="QPushButton" name="btRemoveTheme">
      <property name="toolTip">
       <string>Remove the selected theme from your disk</string>
      </property>
      <property name="whatsThis">
       <string>This will remove the selected theme from your disk.</string>
      </property>
      <property name="text">
       <string>Remove Theme</string>
      </property>
     </widget>
    </item>
-   <item row="5" column="4">
-    <spacer name="horizontalSpacer">
+   <item row="5" column="2">
+    <spacer name="horizontalSpacer_1">
      <property name="orientation">
       <enum>Qt::Horizontal</enum>
      </property>
      <property name="sizeHint" stdset="0">
       <size>
        <width>40</width>
        <height>20</height>
       </size>
      </property>
     </spacer>
    </item>
-   <item row="5" column="2">
-    <widget class="QPushButton" name="btNew">
+   <item row="5" column="3">
+    <widget class="QPushButton" name="btAdd">
      <property name="toolTip">
-      <string>Design a new emoticon theme</string>
+      <string>Create a new emoticon</string>
      </property>
      <property name="whatsThis">
-      <string>Start a new theme by assigning it a name. Then use the Add button on the right to add emoticons to this theme.</string>
+      <string>Create a new emoticon by assigning it an icon and some text</string>
      </property>
      <property name="text">
-      <string>New Theme</string>
+      <string>Add...</string>
      </property>
     </widget>
    </item>
-   <item row="5" column="7">
+   <item row="5" column="4">
+    <widget class="QPushButton" name="btEdit">
+     <property name="toolTip">
+      <string>Modify the selected emoticon icon or text </string>
+     </property>
+     <property name="whatsThis">
+      <string>Edit the selected emoticon to change its icon or its text</string>
+     </property>
+     <property name="text">
+      <string>Edit...</string>
+     </property>
+    </widget>
+   </item>
+   <item row="5" column="5">
     <widget class="QPushButton" name="btRemoveEmoticon">
      <property name="toolTip">
       <string>Remove the selected emoticon</string>
      </property>
      <property name="whatsThis">
       <string>Remove the selected emoticon from your disk</string>
      </property>
      <property name="text">
       <string>Remove</string>
      </property>
     </widget>
    </item>
+   <item row="5" column="6">
+    <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>
+   <item row="5" column="7">
+    <widget class="QPushButton" name="btInstall">
+     <property name="toolTip">
+      <string>Install a theme archive file you already have locally</string>
+     </property>
+     <property name="whatsThis">
+      <string>If you already have an emoticon theme archive locally, this button will unpack it and make it available for KDE applications</string>
+     </property>
+     <property name="text">
+      <string>Install from File...</string>
+     </property>
+    </widget>
+   </item>
+   <item row="5" column="8">
+    <widget class="QPushButton" name="btGetNew">
+     <property name="toolTip">
+      <string>Get new icon themes from the Internet</string>
+     </property>
+     <property name="whatsThis">
+      <string>You need to be connected to the Internet to use this action. A dialog will display a list of emoticon themes from the http://www.kde-look.org website. Clicking the Install button associated with a theme will install this theme locally.</string>
+     </property>
+     <property name="text">
+      <string>Get New Emoticons...</string>
+     </property>
+     <property name="icon">
+      <iconset theme="get-hot-new-stuff">
+       <normaloff/>
+      </iconset>
+     </property>
+    </widget>
+   </item>
   </layout>
  </widget>
  <resources/>
  <connections/>
 </ui>