diff --git a/containments/homescreen/package/contents/ui/HomeDelegate.qml b/containments/homescreen/package/contents/ui/HomeDelegate.qml
index b93dcada..bda9bac1 100644
--- a/containments/homescreen/package/contents/ui/HomeDelegate.qml
+++ b/containments/homescreen/package/contents/ui/HomeDelegate.qml
@@ -144,22 +144,24 @@ ContainmentLayoutManager.ItemContainer {
 
                 Layout.fillWidth: true
                 Layout.preferredHeight: delegate.reservedSpaceForLabel
-                wrapMode: Text.WordWrap
                 Layout.alignment: Qt.AlignTop
-                Layout.leftMargin: -parent.anchors.leftMargin + PlasmaCore.Units.smallSpacing
-                Layout.rightMargin: -parent.anchors.rightMargin + PlasmaCore.Units.smallSpacing
+                Layout.topMargin: PlasmaCore.Units.smallSpacing
+                Layout.leftMargin: -parent.anchors.leftMargin + PlasmaCore.Units.smallSpacing * 2
+                Layout.rightMargin: -parent.anchors.rightMargin + PlasmaCore.Units.smallSpacing * 2
+                
+                wrapMode: Text.WordWrap
                 horizontalAlignment: Text.AlignHCenter
                 verticalAlignment: Text.AlignTop
                 maximumLineCount: 2
                 elide: Text.ElideRight
 
-                text:  model.applicationName
+                text: model.applicationName
 
-                //FIXME: export smallestReadableFont
-                font.pointSize: PlasmaCore.Theme.defaultFont.pointSize * 0.9
-                color: "white"//model.applicationLocation == MobileShell.ApplicationListModel.Desktop ? "white" : PlasmaCore.Theme.textColor
+                font.pointSize: PlasmaCore.Theme.defaultFont.pointSize * 0.8
+                font.weight: Font.Bold
+                color: "white"
 
-                layer.enabled: true//model.applicationLocation == MobileShell.ApplicationListModel.Desktop
+                layer.enabled: true
                 layer.effect: DropShadow {
                     horizontalOffset: 0
                     verticalOffset: 2
diff --git a/containments/homescreen/package/contents/ui/HomeScreen.qml b/containments/homescreen/package/contents/ui/HomeScreen.qml
index 982ae90f..cab32832 100644
--- a/containments/homescreen/package/contents/ui/HomeScreen.qml
+++ b/containments/homescreen/package/contents/ui/HomeScreen.qml
@@ -64,14 +64,6 @@ Item {
             width: flickContainer.width
             height: flickContainer.height
             
-            // listen to app launch errors
-            Connections {
-                target: MobileShell.ApplicationListModel
-                function onLaunchError(msg) {
-                    MobileShell.HomeScreenControls.closeAppLaunchAnimation()
-                }
-            }
-            
             // horizontal pages
             HomeScreenPages {
                 id: pages
diff --git a/containments/homescreen/package/contents/ui/appdrawer/AbstractAppDrawer.qml b/containments/homescreen/package/contents/ui/appdrawer/AbstractAppDrawer.qml
index 98fdd70c..d692898a 100644
--- a/containments/homescreen/package/contents/ui/appdrawer/AbstractAppDrawer.qml
+++ b/containments/homescreen/package/contents/ui/appdrawer/AbstractAppDrawer.qml
@@ -64,7 +64,8 @@ Item {
         id: metrics
         text: "M\nM"
         visible: false
-        font.pointSize: PlasmaCore.Theme.defaultFont.pointSize * 0.9
+        font.pointSize: PlasmaCore.Theme.defaultFont.pointSize * 0.8
+        font.weight: Font.Bold
     }
     
     // bottom divider
diff --git a/containments/homescreen/package/contents/ui/appdrawer/AppDrawerHeader.qml b/containments/homescreen/package/contents/ui/appdrawer/AppDrawerHeader.qml
index bdd1e82a..bfa4a5cb 100644
--- a/containments/homescreen/package/contents/ui/appdrawer/AppDrawerHeader.qml
+++ b/containments/homescreen/package/contents/ui/appdrawer/AppDrawerHeader.qml
@@ -30,6 +30,7 @@ PlasmaCore.ColorScope {
             color: "white"
             level: 1
             text: i18n("Applications")
+            font.weight: Font.Medium
         }
         Item { Layout.fillWidth: true }
         PlasmaComponents.ToolButton {
diff --git a/containments/homescreen/package/contents/ui/appdrawer/DrawerGridDelegate.qml b/containments/homescreen/package/contents/ui/appdrawer/DrawerGridDelegate.qml
index 29675c78..b06ae7d0 100644
--- a/containments/homescreen/package/contents/ui/appdrawer/DrawerGridDelegate.qml
+++ b/containments/homescreen/package/contents/ui/appdrawer/DrawerGridDelegate.qml
@@ -85,9 +85,11 @@ MouseArea {
 
             Layout.fillWidth: true
             Layout.preferredHeight: delegate.reservedSpaceForLabel
+            Layout.topMargin: PlasmaCore.Units.smallSpacing
+            Layout.leftMargin: -parent.anchors.leftMargin + PlasmaCore.Units.smallSpacing * 2
+            Layout.rightMargin: -parent.anchors.rightMargin + PlasmaCore.Units.smallSpacing * 2
+            
             wrapMode: Text.WordWrap
-            Layout.leftMargin: -parent.anchors.leftMargin + PlasmaCore.Units.smallSpacing
-            Layout.rightMargin: -parent.anchors.rightMargin + PlasmaCore.Units.smallSpacing
             maximumLineCount: 2
             horizontalAlignment: Text.AlignHCenter
             verticalAlignment: Text.AlignTop
@@ -95,8 +97,8 @@ MouseArea {
 
             text:  model.applicationName
 
-            //FIXME: export smallestReadableFont
-            font.pointSize: theme.defaultFont.pointSize * 0.9
+            font.pointSize: theme.defaultFont.pointSize * 0.8
+            font.weight: Font.Bold
             color: "white"
         }
     }
diff --git a/containments/homescreen/package/contents/ui/appdrawer/DrawerListDelegate.qml b/containments/homescreen/package/contents/ui/appdrawer/DrawerListDelegate.qml
index a1434b60..e3a02b45 100644
--- a/containments/homescreen/package/contents/ui/appdrawer/DrawerListDelegate.qml
+++ b/containments/homescreen/package/contents/ui/appdrawer/DrawerListDelegate.qml
@@ -99,7 +99,6 @@ MouseArea {
 
             text:  model.applicationName
 
-            //FIXME: export smallestReadableFont
             font.pointSize: Math.round(theme.defaultFont.pointSize * 1.1)
             color: "white"
         }
diff --git a/containments/homescreen/package/contents/ui/main.qml b/containments/homescreen/package/contents/ui/main.qml
index 93662a99..f34199f6 100644
--- a/containments/homescreen/package/contents/ui/main.qml
+++ b/containments/homescreen/package/contents/ui/main.qml
@@ -103,5 +103,13 @@ MobileShell.HomeScreen {
             searchWidget.updateGestureOffset(-offset);
         }
     }
+    
+    // listen to app launch errors
+    Connections {
+        target: MobileShell.ApplicationListModel
+        function onLaunchError(msg) {
+            MobileShell.HomeScreenControls.closeAppLaunchAnimation()
+        }
+    }
 }