diff --git a/src/shell/applets/testcomponentsapplet/contents/ui/ButtonsPage.qml b/src/shell/applets/testcomponentsapplet/contents/ui/ButtonsPage.qml
new file mode 100644
index 000000000..8315153ca
--- /dev/null
+++ b/src/shell/applets/testcomponentsapplet/contents/ui/ButtonsPage.qml
@@ -0,0 +1,76 @@
+/*
+ *  Copyright 2013 Sebastian Kügler <sebas@kde.org>
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program; if not, write to the Free Software
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+ */
+
+import QtQuick 2.0
+
+import org.kde.plasma.core 0.1 as PlasmaCore
+import org.kde.plasma.components 0.1 as PlasmaComponents
+import org.kde.plasma.extras 0.1 as PlasmaExtras
+import org.kde.qtextracomponents 0.1 as QtExtras
+
+// ButtonsPage
+
+PlasmaComponents.Page {
+    id: plasmoidPage
+    anchors {
+        fill: parent
+        margins: _s
+    }
+    Column {
+        spacing: _s/2
+        anchors.fill: parent
+        PlasmaExtras.Heading {
+            level: 1
+            width: parent.width
+            text: "Buttons"
+        }
+        Row {
+            height: _h
+            spacing: _s
+            PlasmaComponents.Button {
+                text: "Button"
+                iconSource: "call-start"
+            }
+            PlasmaComponents.ToolButton {
+                text: "ToolButton"
+                iconSource: "call-stop"
+            }
+        }
+        Row {
+            height: _h
+            spacing: _s
+            PlasmaComponents.RadioButton {
+                id: radio
+                text: "RadioButton"
+                //iconSource: "call-stop"
+                onCheckedChanged: if (checked) tfield.forceActiveFocus()
+            }
+            PlasmaComponents.TextField {
+                id: tfield
+                enabled: radio.checked
+                text: "input here"
+                clearButtonShown: true
+            }
+        }
+        PlasmaComponents.TextArea {
+            width: parent.width
+            height: _h*2
+        }
+    }
+}
+
diff --git a/src/shell/applets/testcomponentsapplet/contents/ui/IconsPage.qml b/src/shell/applets/testcomponentsapplet/contents/ui/IconsPage.qml
index 8d6144aed..379ee2ce3 100644
--- a/src/shell/applets/testcomponentsapplet/contents/ui/IconsPage.qml
+++ b/src/shell/applets/testcomponentsapplet/contents/ui/IconsPage.qml
@@ -79,54 +79,13 @@ PlasmaComponents.Page {
             }
 
         }
-        PlasmaExtras.Heading {
-            level: 4
-            width: parent.width
-            text: "Buttons"
-        }
-        Column {
-            width: parent.width
-            spacing: _s/2
-            Row {
-                height: _h
-                spacing: _s
-                PlasmaComponents.Button {
-                    text: "Button"
-                    iconSource: "call-start"
-                }
-                PlasmaComponents.ToolButton {
-                    text: "ToolButton"
-                    iconSource: "call-stop"
-                }
-            }
-            Row {
-                height: _h
-                spacing: _s
-                PlasmaComponents.RadioButton {
-                    id: radio
-                    text: "RadioButton"
-                    //iconSource: "call-stop"
-                    onCheckedChanged: if (checked) tfield.forceActiveFocus()
-                }
-                PlasmaComponents.TextField {
-                    id: tfield
-                    enabled: radio.checked
-                    text: "input here"
-                    clearButtonShown: true
-                }
-            }
-//             PlasmaComponents.TextArea {
-//                 height: _h*2
-//                 spacing: _s
-//             }
-            PlasmaComponents.Label {
-                text: "iconSizes.small  : " + theme.iconSizes.small +
-                      ", iconSizes.desktop: " + theme.iconSizes.desktop +
-                      ",<br />iconSizes.toolbar: " + theme.iconSizes.toolbar +
-                      ", iconSizes.dialog : " + theme.iconSizes.dialog
 
-            }
-        }
+        PlasmaComponents.Label {
+            text: "iconSizes.small  : " + theme.iconSizes.small +
+                    ", iconSizes.desktop: " + theme.iconSizes.desktop +
+                    ",<br />iconSizes.toolbar: " + theme.iconSizes.toolbar +
+                    ", iconSizes.dialog : " + theme.iconSizes.dialog
 
+        }
     }
 }
diff --git a/src/shell/applets/testcomponentsapplet/contents/ui/testcomponents.qml b/src/shell/applets/testcomponentsapplet/contents/ui/testcomponents.qml
index 3afdc2b54..e048da53a 100644
--- a/src/shell/applets/testcomponentsapplet/contents/ui/testcomponents.qml
+++ b/src/shell/applets/testcomponentsapplet/contents/ui/testcomponents.qml
@@ -46,6 +46,7 @@ Item {
         }
         height: _h
 
+        PlasmaComponents.TabButton { tab: buttonsPage; iconSource: "preferences-desktop-theme"}
         PlasmaComponents.TabButton { tab: iconsPage; iconSource: "preferences-desktop-icons"}
         PlasmaComponents.TabButton { tab: plasmoidPage; iconSource: "plasma"}
         PlasmaComponents.TabButton { tab: mousePage; iconSource: "preferences-desktop-mouse"}
@@ -62,6 +63,10 @@ Item {
 
         //currentTab: tabBar.currentTab
 
+        ButtonsPage {
+            id: buttonsPage
+        }
+
         IconsPage {
             id: iconsPage
         }