diff --git a/resources/qml/ApplicationSwitcher/ApplicationButton.qml b/resources/qml/ApplicationSwitcher/ApplicationButton.qml
index d1d94eb4a2..c722b172af 100644
--- a/resources/qml/ApplicationSwitcher/ApplicationButton.qml
+++ b/resources/qml/ApplicationSwitcher/ApplicationButton.qml
@@ -42,7 +42,7 @@ Button
             id: applicationIcon
             anchors.horizontalCenter: parent.horizontalCenter
 
-            color: UM.Theme.getColor("monitor_icon_primary")
+            color: UM.Theme.getColor("icon")
             width: UM.Theme.getSize("application_switcher_icon").width
             height: width
 
@@ -64,7 +64,7 @@ Button
                 {
                     id: externalLinkIndicatorBackground
                     anchors.centerIn: parent
-                    width: UM.Theme.getSize("small_button_icon").width
+                    width: UM.Theme.getSize("icon_indicator_background").width
                     height: width
                     color: base.hovered ? UM.Theme.getColor("action_button_hovered") : UM.Theme.getColor("action_button")
                     radius: 0.5 * width
@@ -75,9 +75,9 @@ Button
                     id: externalLinkIndicatorIcon
                     anchors.centerIn: parent
 
-                    width: UM.Theme.getSize("printer_status_icon").width
+                    width: UM.Theme.getSize("icon_indicator").width
                     height: width
-                    color: UM.Theme.getColor("monitor_icon_primary")
+                    color: UM.Theme.getColor("icon")
                     source: UM.Theme.getIcon("LinkExternal")
                 }
             }
diff --git a/resources/qml/ApplicationSwitcher/ApplicationSwitcher.qml b/resources/qml/ApplicationSwitcher/ApplicationSwitcher.qml
index 8d4d7306f9..c09c6e9547 100644
--- a/resources/qml/ApplicationSwitcher/ApplicationSwitcher.qml
+++ b/resources/qml/ApplicationSwitcher/ApplicationSwitcher.qml
@@ -11,13 +11,12 @@ import Cura 1.1 as Cura
 Item
 {
     id: applicationSwitcherWidget
-    width: appSwitcherButton.width
+    width: applicationSwitcherButton.width
     height: width
 
-
     Button
     {
-        id: appSwitcherButton
+        id: applicationSwitcherButton
         anchors.verticalCenter: parent.verticalCenter
         anchors.horizontalCenter: parent.horizontalCenter
 
@@ -28,8 +27,8 @@ Item
         {
             width: parent.width
             height: width
-            anchors.verticalCenter: appSwitcherButton.verticalCenter
-            anchors.horizontalCenter: appSwitcherButton.horizontalCenter
+            anchors.verticalCenter: applicationSwitcherButton.verticalCenter
+            anchors.horizontalCenter: applicationSwitcherButton.horizontalCenter
             color: UM.Theme.getColor("main_background")
 
             source: UM.Theme.getIcon("ApplicationSwitcher")
@@ -37,18 +36,18 @@ Item
 
         onClicked:
         {
-            if (popup.opened)
+            if (applicationSwitcherPopup.opened)
             {
-                popup.close()
+                applicationSwitcherPopup.close()
             } else {
-                popup.open()
+                applicationSwitcherPopup.open()
             }
         }
     }
 
     Popup
     {
-        id: popup
+        id: applicationSwitcherPopup
 
         y: parent.height + UM.Theme.getSize("default_arrow").height
         x: parent.width - width
@@ -63,7 +62,7 @@ Item
 
         contentItem: Item
         {
-            id: projectListContainer
+            id: applicationsContainer
             anchors.fill: parent
             anchors.margins: UM.Theme.getSize("wide_margin").width
 
@@ -73,17 +72,16 @@ Item
                 anchors.top: parent.top
                 anchors.left: parent.left
 
-                width: gridLayout.width
+                width: ultimakerPlatformLinksGrid.width
 
                 Grid
                 {
-                    id: gridLayout
+                    id: ultimakerPlatformLinksGrid
                     columns: 3
                     spacing: UM.Theme.getSize("default_margin").width
+
                     Repeater
                     {
-                        id:gridgenerate
-
                         model:
                         [
                             { displayName: "Report issue1", thumbnail: UM.Theme.getIcon("Bug"), description: "This is the description1", link: "https://github.com/Ultimaker/Cura/issues/1" },
@@ -114,7 +112,7 @@ Item
             borderColor: UM.Theme.getColor("lining")
             borderWidth: UM.Theme.getSize("default_lining").width
 
-            target: Qt.point(width - (appSwitcherButton.width / 2), -10)
+            target: Qt.point(width - (applicationSwitcherButton.width / 2), -10)
 
             arrowSize: UM.Theme.getSize("default_arrow").width
         }
diff --git a/resources/themes/cura-light/theme.json b/resources/themes/cura-light/theme.json
index 568b2d261b..daa12b3390 100644
--- a/resources/themes/cura-light/theme.json
+++ b/resources/themes/cura-light/theme.json
@@ -574,6 +574,9 @@
         "favorites_button": [2, 2],
         "favorites_button_icon": [1.2, 1.2],
 
+        "icon_indicator_background": [1.5, 1.5],
+        "icon_indicator": [1, 1],
+
         "printer_status_icon": [1.0, 1.0],
         "printer_sync_icon": [1.2, 1.2],