diff --git a/libs/ev3/ns.ts b/libs/ev3/ns.ts
index 32690ba1..eb7f4a6c 100644
--- a/libs/ev3/ns.ts
+++ b/libs/ev3/ns.ts
@@ -19,12 +19,12 @@ namespace sensors {
 namespace motors {
 }
 
-//% color="#D67923" weight=80
+//% color="#D67923" weight=80 icon="\uf10e"
 namespace music {
 
 }
 
-//% color="#5F3109"
+//% color="#5F3109" icon="\uf107"
 namespace control {
 
 }
diff --git a/package.json b/package.json
index 5126a1a8..6a0ed1d8 100644
--- a/package.json
+++ b/package.json
@@ -45,7 +45,7 @@
   },
   "dependencies": {
     "pxt-common-packages": "0.14.13",
-    "pxt-core": "3.0.2"
+    "pxt-core": "3.0.5"
   },
   "scripts": {
     "test": "node node_modules/pxt-core/built/pxt.js travis"
diff --git a/pxtarget.json b/pxtarget.json
index 64a763e7..0ac49e60 100644
--- a/pxtarget.json
+++ b/pxtarget.json
@@ -137,6 +137,15 @@
             "functions": "#19325A",
             "arrays": "#901F76"
         },
+        "blockIcons": {
+            "loops": "\uf10b",
+            "logic": "\uf10a",
+            "math": "\uf10c",
+            "variables": "\uf111",
+            "text": "\uf110",
+            "functions": "\uf108",
+            "arrays": "\uf109"
+        },
         "monacoColors": {
             "editor.background": "#ecf6ff"
         }
diff --git a/theme/blockly.less b/theme/blockly.less
index 0154b9ac..a4b5ce55 100644
--- a/theme/blockly.less
+++ b/theme/blockly.less
@@ -82,10 +82,6 @@ span.blocklyTreeLabel {
     }
 }
 
-span.blocklyTreeIcon.blocklyTreeIconmusic::before {
-    content: "\f10e";
-}
-
 span.blocklyTreeIcon.blocklyTreeIconloops::before {
     content: "\f10b";
 }
@@ -117,10 +113,6 @@ span.blocklyTreeIcon.blocklyTreeIcontext::before {
     content: "\f110";
 }
 
-span.blocklyTreeIcon.blocklyTreeIconcontrol::before {
-    content: "\f107";
-}
-
 span.blocklyTreeIcon.blocklyTreeIconaddpackage::before {
     content: "\f105";
 }