diff --git a/src/shell/applets/testcomponentsapplet/contents/ui/IconsPage.qml b/src/shell/applets/testcomponentsapplet/contents/ui/IconsPage.qml
index 2b89d513f..39187a6fc 100644
--- a/src/shell/applets/testcomponentsapplet/contents/ui/IconsPage.qml
+++ b/src/shell/applets/testcomponentsapplet/contents/ui/IconsPage.qml
@@ -38,10 +38,6 @@ PlasmaComponents.Page {
         PlasmaExtras.Title {
             width: parent.width
             elide: Text.ElideRight
-            text: "This is a <i>PlasmaComponent</i>"
-        }
-        PlasmaComponents.Label {
-            width: parent.width
             text: "Icons"
         }
         Row {
@@ -90,7 +86,7 @@ PlasmaComponents.Page {
         }
         Column {
             width: parent.width
-            spacing: _s
+            spacing: _s/2
 
             PlasmaComponents.Button {
                 text: "Button"
@@ -104,6 +100,13 @@ PlasmaComponents.Page {
                 text: "RadioButton"
                 //iconSource: "call-stop"
             }
+            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/MousePage.qml b/src/shell/applets/testcomponentsapplet/contents/ui/MousePage.qml
index a54403ad9..54dff817d 100644
--- a/src/shell/applets/testcomponentsapplet/contents/ui/MousePage.qml
+++ b/src/shell/applets/testcomponentsapplet/contents/ui/MousePage.qml
@@ -26,7 +26,7 @@ import org.kde.qtextracomponents 0.1 as QtExtras
 // MousePage
 
 PlasmaComponents.Page {
-    id: melPage
+    id: mousePage
     anchors {
         fill: parent
         margins: _s
diff --git a/src/shell/applets/testcomponentsapplet/contents/ui/PlasmoidPage.qml b/src/shell/applets/testcomponentsapplet/contents/ui/PlasmoidPage.qml
index e5fdfe6e6..29fa23f3b 100644
--- a/src/shell/applets/testcomponentsapplet/contents/ui/PlasmoidPage.qml
+++ b/src/shell/applets/testcomponentsapplet/contents/ui/PlasmoidPage.qml
@@ -26,7 +26,7 @@ import org.kde.qtextracomponents 0.1 as QtExtras
 // PlasmoidPage
 
 PlasmaComponents.Page {
-    id: pageTwo
+    id: plasmoidPage
     anchors {
         fill: parent
         margins: _s
diff --git a/src/shell/applets/testcomponentsapplet/contents/ui/testcomponents.qml b/src/shell/applets/testcomponentsapplet/contents/ui/testcomponents.qml
index 48b244631..3afdc2b54 100644
--- a/src/shell/applets/testcomponentsapplet/contents/ui/testcomponents.qml
+++ b/src/shell/applets/testcomponentsapplet/contents/ui/testcomponents.qml
@@ -28,8 +28,8 @@ Item {
     width: 100
     height: 100
 
-    property int _s: 12
-    property int _h: 32
+    property int _s: theme.iconSizes.small
+    property int _h: theme.iconSizes.desktop
 
     PlasmaCore.DataSource {
         id: dataSource
@@ -46,13 +46,13 @@ Item {
         }
         height: _h
 
-        currentTab: melPage
         PlasmaComponents.TabButton { tab: iconsPage; iconSource: "preferences-desktop-icons"}
         PlasmaComponents.TabButton { tab: plasmoidPage; iconSource: "plasma"}
         PlasmaComponents.TabButton { tab: mousePage; iconSource: "preferences-desktop-mouse"}
     }
 
     PlasmaComponents.TabGroup {
+        id: tabGroup
         anchors {
             left: parent.left
             right: parent.right
@@ -66,17 +66,18 @@ Item {
             id: iconsPage
         }
 
-        PlasmoidPage { 
+        PlasmoidPage {
             id: plasmoidPage
         }
 
         MousePage {
-            id: mousPage
+            id: mousePage
         }
     }
 
     Component.onCompleted: {
-        print("Components Test Applet loaded")
+        print("Components Test Applet loaded");
         //dataSource.engine = "org.kde.foobar"
+//         tabGroup.currentTab = mousePage;
     }
 }
\ No newline at end of file