diff --git a/libs/bluetooth/bluetooth.ts b/libs/bluetooth/bluetooth.ts
index 3f480408..9ea72eed 100644
--- a/libs/bluetooth/bluetooth.ts
+++ b/libs/bluetooth/bluetooth.ts
@@ -1,7 +1,7 @@
 /**
  * Support for additional Bluetooth services.
  */
-//% color=#0082FB weight=20
+//% color=#0082FB weight=20 icon="\uf294"
 namespace bluetooth {
     /**
     *  Writes to the Bluetooth UART service buffer. From there the data is transmitted over Bluetooth to a connected device.
diff --git a/libs/core/basic.cpp b/libs/core/basic.cpp
index 4340de27..b379f5f2 100644
--- a/libs/core/basic.cpp
+++ b/libs/core/basic.cpp
@@ -4,12 +4,12 @@
 /**
  * Provides access to basic micro:bit functionality.
  */
-//% color=#54C9C9 weight=100
+//% color=#54C9C9 weight=100 icon="\uf00a"
 namespace basic {
     /**
     * Sets the color on the build-in LED. Set to 0 to turn off.
     */
-    //% blockId=device_set_led_color block="set led to %color=color_id" icon="\uf00a"
+    //% blockId=device_set_led_color block="set led to %color=color_id"
     //% weight=50
     void setLedColor(int color) {
       if (!color) {
@@ -31,7 +31,7 @@ namespace basic {
      */
     //% help=basic/show-number
     //% weight=96
-    //% blockId=device_show_number block="show|number %number" blockGap=8 icon="\uf1ec"
+    //% blockId=device_show_number block="show|number %number" blockGap=8
     //% async
     //% parts="ledmatrix"
     void showNumber(int value, int interval = 150) { 
@@ -55,7 +55,7 @@ namespace basic {
     //% weight=95 blockGap=8
     //% imageLiteral=1 async
     //% blockId=device_show_leds
-    //% block="show leds" icon="\uf00a"
+    //% block="show leds"
     //% parts="ledmatrix"
     void showLeds(ImageLiteral leds, int interval = 400) {
       uBit.display.print(MicroBitImage(imageBytes(leds)), 0, 0, 0, interval);
@@ -68,7 +68,7 @@ namespace basic {
      */
     //% help=basic/show-string 
     //% weight=87 blockGap=8
-    //% block="show|string %text" icon="\uf031" 
+    //% block="show|string %text" 
     //% async
     //% blockId=device_print_message
     //% parts="ledmatrix"
@@ -91,7 +91,7 @@ namespace basic {
      * Turn off all LEDs
      */
     //% help=basic/clear-screen weight=79
-    //% blockId=device_clear_display block="clear screen" icon="\uf12d"
+    //% blockId=device_clear_display block="clear screen"
     //% parts="ledmatrix"
     void clearScreen() {
       uBit.display.image.clear();
@@ -131,7 +131,7 @@ namespace basic {
      * @param body code to execute
      */
     //% help=basic/forever weight=55 blockGap=8
-    //% blockId=device_forever block="forever" icon="\uf01e"
+    //% blockId=device_forever block="forever"
     void forever(Action a) {
       if (a != 0) {
         incr(a);
@@ -145,7 +145,7 @@ namespace basic {
      */
     //% help=basic/pause weight=54
     //% async block="pause (ms) %pause"
-    //% blockId=device_pause icon="\uf110"
+    //% blockId=device_pause
     void pause(int ms) {
       fiber_sleep(ms);
     }
diff --git a/libs/core/control.ts b/libs/core/control.ts
index 1245beb6..919d8988 100644
--- a/libs/core/control.ts
+++ b/libs/core/control.ts
@@ -1,7 +1,7 @@
 /**
 * Runtime and event utilities.
 */
-//% weight=1 color="#42495F"
+//% weight=1 color="#42495F" icon="\uf233"
 //% advanced=true
 namespace control {
 
diff --git a/libs/core/game.ts b/libs/core/game.ts
index c84ae864..4f5eb73c 100644
--- a/libs/core/game.ts
+++ b/libs/core/game.ts
@@ -21,7 +21,7 @@ enum LedSpriteProperty {
 /**
  * A single-LED sprite game engine
  */
-//% color=#008272 weight=32
+//% color=#008272 weight=32 icon="\uf11b"
 //% advanced=true
 namespace game {
     let _score: number = 0;
diff --git a/libs/core/images.cpp b/libs/core/images.cpp
index dbb868a0..6e6fc286 100644
--- a/libs/core/images.cpp
+++ b/libs/core/images.cpp
@@ -3,7 +3,7 @@
 /**
 * Creation, manipulation and display of LED images.
 */
-//% color=#5C2D91 weight=31
+//% color=#5C2D91 weight=31 icon="\uf03e"
 //% advanced=true
 namespace images {
     /**
diff --git a/libs/core/input.cpp b/libs/core/input.cpp
index c4ff5086..aa4d89c6 100644
--- a/libs/core/input.cpp
+++ b/libs/core/input.cpp
@@ -108,7 +108,7 @@ enum class Gesture {
     SixG = MICROBIT_ACCELEROMETER_EVT_6G
 };
 
-//% color=#C90072 weight=99
+//% color=#C90072 weight=99 icon="\uf192"
 namespace input {
     /**
      * Do something when a button (``A``, ``B`` or both ``A+B``) is pressed
@@ -116,7 +116,7 @@ namespace input {
      * @param body TODO
      */
     //% help=input/on-button-pressed weight=85 blockGap=8
-    //% blockId=device_button_event block="on button|%NAME|pressed" icon="\uf192"
+    //% blockId=device_button_event block="on button|%NAME|pressed"
     //% parts="buttonpair"
     void onButtonPressed(Button button, Action body) {
         registerWithDal((int)button, MICROBIT_BUTTON_EVT_CLICK, body);
@@ -127,7 +127,7 @@ namespace input {
      * @param body TODO
      */
     //% help=input/on-gesture weight=84 blockGap=8
-    //% blockId=device_gesture_event block="on |%NAME" icon="\uf135"
+    //% blockId=device_gesture_event block="on |%NAME"
     //% parts="accelerometer"
     void onGesture(Gesture gesture, Action body) {
         if ((int)gesture == MICROBIT_ACCELEROMETER_EVT_3G && uBit.accelerometer.getRange() < 3)
@@ -143,7 +143,7 @@ namespace input {
      * @param body the code to run when the pin is pressed
      */
     //% help=input/on-pin-pressed weight=83
-    //% blockId=device_pin_event block="on pin %NAME|pressed" icon="\uf094"
+    //% blockId=device_pin_event block="on pin %NAME|pressed"
     void onPinPressed(TouchPin name, Action body) {
         auto pin = getPin((int)name);
         if (!pin) return;
@@ -159,7 +159,7 @@ namespace input {
      * @param body the code to run when the pin is released
      */
     //% help=input/on-pin-released weight=6 blockGap=8
-    //% blockId=device_pin_released block="on pin %NAME|released" icon="\uf094"
+    //% blockId=device_pin_released block="on pin %NAME|released"
     //% advanced=true
     void onPinReleased(TouchPin name, Action body) {
         auto pin = getPin((int)name);
@@ -176,7 +176,7 @@ namespace input {
     //% help=input/button-is-pressed weight=60
     //% block="button|%NAME|is pressed"
     //% blockId=device_get_button2
-    //% icon="\uf192" blockGap=8
+    //% blockGap=8
     //% parts="buttonpair"
     bool buttonIsPressed(Button button) {
       if (button == Button::A)
@@ -193,7 +193,7 @@ namespace input {
      * @param name pin used to detect the touch
      */
     //% help=input/pin-is-pressed weight=58
-    //% blockId="device_pin_is_pressed" block="pin %NAME|is pressed" icon="\uf094"
+    //% blockId="device_pin_is_pressed" block="pin %NAME|is pressed"
     //% blockGap=8
     bool pinIsPressed(TouchPin name) {
         auto pin = getPin((int)name);
@@ -211,7 +211,7 @@ namespace input {
      * Get the acceleration value in milli-gravitys (when the board is laying flat with the screen up, x=0, y=0 and z=-1024)
      * @param dimension TODO
      */
-    //% help=input/acceleration weight=58 icon="\uf135"
+    //% help=input/acceleration weight=58
     //% blockId=device_acceleration block="acceleration (mg)|%NAME" blockGap=8
     //% parts="accelerometer"
     int acceleration(Dimension dimension) {
@@ -228,7 +228,7 @@ namespace input {
      * Reads the light level applied to the LED screen in a range from ``0`` (dark) to ``255`` bright.
      */
     //% help=input/light-level weight=57
-    //% blockId=device_get_light_level block="light level" blockGap=8 icon="\uf185"
+    //% blockId=device_get_light_level block="light level" blockGap=8
     //% parts="ledmatrix"
     int lightLevel() {
         return uBit.display.readLightLevel();
@@ -238,7 +238,7 @@ namespace input {
      * Get the current compass heading in degrees.
      */
     //% help=input/compass-heading
-    //% weight=56 icon="\uf14e"
+    //% weight=56
     //% blockId=device_heading block="compass heading (°)" blockGap=8
     //% parts="compass"
     int compassHeading() {
@@ -249,7 +249,7 @@ namespace input {
     /**
      * Gets the temperature in Celsius degrees (°C).
      */
-    //% weight=55 icon="\uf06d"
+    //% weight=55
     //% help=input/temperature
     //% blockId=device_temperature block="temperature (°C)" blockGap=8
     //% parts="thermometer"
@@ -262,7 +262,7 @@ namespace input {
      * @param kind TODO
      */
     //% help=input/rotation weight=52
-    //% blockId=device_get_rotation block="rotation (°)|%NAME" blockGap=8 icon="\uf197"
+    //% blockId=device_get_rotation block="rotation (°)|%NAME" blockGap=8
     //% parts="accelerometer" advanced=true
     int rotation(Rotation kind) {
       switch (kind) {
@@ -277,7 +277,7 @@ namespace input {
      * @param dimension TODO
      */
     //% help=input/magnetic-force weight=51
-    //% blockId=device_get_magnetic_force block="magnetic force (µT)|%NAME" blockGap=8 icon="\uf076"
+    //% blockId=device_get_magnetic_force block="magnetic force (µT)|%NAME" blockGap=8
     //% parts="compass"
     //% advanced=true
     int magneticForce(Dimension dimension) {
@@ -297,7 +297,7 @@ namespace input {
      * Gets the number of milliseconds elapsed since power on.
      */
     //% help=input/running-time weight=50
-    //% blockId=device_get_running_time block="running time (ms)" icon="\uf017"
+    //% blockId=device_get_running_time block="running time (ms)"
     //% advanced=true
     int runningTime() {
         return system_timer_current_time();
@@ -314,7 +314,7 @@ namespace input {
      * @param range a value describe the maximum strengh of acceleration measured
      */
     //% help=input/set-accelerometer-range
-    //% blockId=device_set_accelerometer_range block="set accelerometer|range %range" icon="\uf135"
+    //% blockId=device_set_accelerometer_range block="set accelerometer|range %range"
     //% weight=5
     //% parts="accelerometer"
     //% advanced=true
diff --git a/libs/core/led.cpp b/libs/core/led.cpp
index 2d5e9a03..5054cd6c 100644
--- a/libs/core/led.cpp
+++ b/libs/core/led.cpp
@@ -8,7 +8,7 @@ enum class DisplayMode_ {
     // TODO DISPLAY_MODE_BLACK_AND_WHITE_LIGHT_SENSE
 };
 
-//% color=#8169E6 weight=35
+//% color=#8169E6 weight=35 icon="\uf205"
 namespace led {
 
     /**
@@ -17,7 +17,7 @@ namespace led {
      * @param y TODO
      */
     //% help=led/plot weight=78
-    //% blockId=device_plot block="plot|x %x|y %y" icon="\uf205" blockGap=8
+    //% blockId=device_plot block="plot|x %x|y %y" blockGap=8
     //% parts="ledmatrix"
     void plot(int x, int y) {
       uBit.display.image.setPixelValue(x, y, 1);
@@ -29,7 +29,7 @@ namespace led {
      * @param y TODO
      */
     //% help=led/unplot weight=77
-    //% blockId=device_unplot block="unplot|x %x|y %y" icon="\uf204" blockGap=8
+    //% blockId=device_unplot block="unplot|x %x|y %y" blockGap=8
     //% parts="ledmatrix"
     void unplot(int x, int y) {
       uBit.display.image.setPixelValue(x, y, 0);
@@ -41,7 +41,7 @@ namespace led {
      * @param y TODO
      */
     //% help=led/point weight=76
-    //% blockId=device_point block="point|x %x|y %y" icon="\uf10c"
+    //% blockId=device_point block="point|x %x|y %y"
     //% parts="ledmatrix"
     bool point(int x, int y) {
       int pix = uBit.display.image.getPixelValue(x, y);
@@ -52,7 +52,7 @@ namespace led {
      * Get the screen brightness from 0 (off) to 255 (full bright).
      */
     //% help=led/brightness weight=60
-    //% blockId=device_get_brightness block="brightness" icon="\uf042" blockGap=8
+    //% blockId=device_get_brightness block="brightness" blockGap=8
     //% parts="ledmatrix"
     //% advanced=true
     int brightness() {
@@ -64,7 +64,7 @@ namespace led {
      * @param value the brightness value, eg:255, 127, 0
      */
     //% help=led/set-brightness weight=59
-    //% blockId=device_set_brightness block="set brightness %value" icon="\uf042"
+    //% blockId=device_set_brightness block="set brightness %value"
     //% parts="ledmatrix"
     //% advanced=true
     void setBrightness(int value) {
@@ -75,7 +75,7 @@ namespace led {
      * Cancels the current animation and clears other pending animations.
      */
     //% weight=50 help=led/stop-animation
-    //% blockId=device_stop_animation block="stop animation" icon="\uf04d"
+    //% blockId=device_stop_animation block="stop animation"
     //% parts="ledmatrix"
     //% advanced=true
     void stopAnimation() {
@@ -95,7 +95,7 @@ namespace led {
     /**
     * Turns on or off the display    
     */
-    //% help=led/enable blockId=device_led_enable icon="\uf04d"
+    //% help=led/enable blockId=device_led_enable
     //% advanced=true parts="ledmatrix"
     void enable(bool on) {
         if (on) uBit.display.enable();
diff --git a/libs/core/motors.cpp b/libs/core/motors.cpp
index 40c2058d..6e2f1903 100644
--- a/libs/core/motors.cpp
+++ b/libs/core/motors.cpp
@@ -19,7 +19,7 @@ enum Motor {
 /**
 * Blocks to control the onboard motors
 */
-//% color=#008272 weight=30
+//% color=#008272 weight=30 icon="\uf1b9"
 namespace motors {
     /**
     * Turns on the motor at a certain percent of power. Switches to single motor mode!
diff --git a/libs/core/music.ts b/libs/core/music.ts
index a554015d..3f275a2a 100644
--- a/libs/core/music.ts
+++ b/libs/core/music.ts
@@ -125,7 +125,7 @@ enum BeatFraction {
 /**
  * Generation of music tones through pin ``P0``.
  */
-//% color=#DF4600 weight=98
+//% color=#DF4600 weight=98 icon="\uf025"
 namespace music {
     let beatsPerMinute: number = 120;
 
@@ -145,7 +145,7 @@ namespace music {
      * @param frequency pitch of the tone to play in Hertz (Hz)
      */
     //% help=music/ring-tone weight=80
-    //% blockId=device_ring block="ring tone (Hz)|%note=device_note" icon="\uf025" blockGap=8
+    //% blockId=device_ring block="ring tone (Hz)|%note=device_note" blockGap=8
     //% parts="speaker" async
     export function ringTone(frequency: number) {
         playTone(frequency, 0);
diff --git a/libs/core/pins.ts b/libs/core/pins.ts
index 2b9bc3c1..5f70b304 100644
--- a/libs/core/pins.ts
+++ b/libs/core/pins.ts
@@ -1,7 +1,7 @@
 /**
  * Control currents in Pins for analog/digital signals, servos, i2c, ...
  */
-//% color=#A80000 weight=30
+//% color=#A80000 weight=30 icon="\uf140"
 //% advanced=true
 namespace pins {
     /**
diff --git a/libs/core/serial.ts b/libs/core/serial.ts
index 7de284c4..ba7651a6 100644
--- a/libs/core/serial.ts
+++ b/libs/core/serial.ts
@@ -1,7 +1,7 @@
 /**
  * Reading and writing data over a serial connection.
  */
-//% weight=2 color=#002050
+//% weight=2 color=#002050 icon="\uf287"
 //% advanced=true
 namespace serial {
     /**
diff --git a/libs/core/shims.d.ts b/libs/core/shims.d.ts
index b9349e0d..546d2d14 100644
--- a/libs/core/shims.d.ts
+++ b/libs/core/shims.d.ts
@@ -4,7 +4,7 @@
     /**
      * Creation, manipulation and display of LED images.
      */
-    //% color=#5C2D91 weight=31
+    //% color=#5C2D91 weight=31 icon="\uf03e"
     //% advanced=true
 declare namespace images {
 
@@ -126,13 +126,13 @@ declare interface Image {
     /**
      * Provides access to basic micro:bit functionality.
      */
-    //% color=#54C9C9 weight=100
+    //% color=#54C9C9 weight=100 icon="\uf00a"
 declare namespace basic {
 
     /**
      * Sets the color on the build-in LED. Set to 0 to turn off.
      */
-    //% blockId=device_set_led_color block="set led to %color=color_id" icon="\uf00a"
+    //% blockId=device_set_led_color block="set led to %color=color_id"
     //% weight=50 shim=basic::setLedColor
     function setLedColor(color: number): void;
 
@@ -142,7 +142,7 @@ declare namespace basic {
      */
     //% help=basic/show-number
     //% weight=96
-    //% blockId=device_show_number block="show|number %number" blockGap=8 icon="\uf1ec"
+    //% blockId=device_show_number block="show|number %number" blockGap=8
     //% async
     //% parts="ledmatrix" interval.defl=150 shim=basic::showNumber
     function showNumber(value: number, interval?: number): void;
@@ -156,7 +156,7 @@ declare namespace basic {
     //% weight=95 blockGap=8
     //% imageLiteral=1 async
     //% blockId=device_show_leds
-    //% block="show leds" icon="\uf00a"
+    //% block="show leds"
     //% parts="ledmatrix" interval.defl=400 shim=basic::showLeds
     function showLeds(leds: string, interval?: number): void;
 
@@ -167,7 +167,7 @@ declare namespace basic {
      */
     //% help=basic/show-string 
     //% weight=87 blockGap=8
-    //% block="show|string %text" icon="\uf031" 
+    //% block="show|string %text" 
     //% async
     //% blockId=device_print_message
     //% parts="ledmatrix" interval.defl=150 shim=basic::showString
@@ -177,7 +177,7 @@ declare namespace basic {
      * Turn off all LEDs
      */
     //% help=basic/clear-screen weight=79
-    //% blockId=device_clear_display block="clear screen" icon="\uf12d"
+    //% blockId=device_clear_display block="clear screen"
     //% parts="ledmatrix" shim=basic::clearScreen
     function clearScreen(): void;
 
@@ -203,7 +203,7 @@ declare namespace basic {
      * @param body code to execute
      */
     //% help=basic/forever weight=55 blockGap=8
-    //% blockId=device_forever block="forever" icon="\uf01e" shim=basic::forever
+    //% blockId=device_forever block="forever" shim=basic::forever
     function forever(a: () => void): void;
 
     /**
@@ -212,13 +212,13 @@ declare namespace basic {
      */
     //% help=basic/pause weight=54
     //% async block="pause (ms) %pause"
-    //% blockId=device_pause icon="\uf110" shim=basic::pause
+    //% blockId=device_pause shim=basic::pause
     function pause(ms: number): void;
 }
 
 
 
-    //% color=#C90072 weight=99
+    //% color=#C90072 weight=99 icon="\uf192"
 declare namespace input {
 
     /**
@@ -227,7 +227,7 @@ declare namespace input {
      * @param body TODO
      */
     //% help=input/on-button-pressed weight=85 blockGap=8
-    //% blockId=device_button_event block="on button|%NAME|pressed" icon="\uf192"
+    //% blockId=device_button_event block="on button|%NAME|pressed"
     //% parts="buttonpair" shim=input::onButtonPressed
     function onButtonPressed(button: Button, body: () => void): void;
 
@@ -236,7 +236,7 @@ declare namespace input {
      * @param body TODO
      */
     //% help=input/on-gesture weight=84 blockGap=8
-    //% blockId=device_gesture_event block="on |%NAME" icon="\uf135"
+    //% blockId=device_gesture_event block="on |%NAME"
     //% parts="accelerometer" shim=input::onGesture
     function onGesture(gesture: Gesture, body: () => void): void;
 
@@ -246,7 +246,7 @@ declare namespace input {
      * @param body the code to run when the pin is pressed
      */
     //% help=input/on-pin-pressed weight=83
-    //% blockId=device_pin_event block="on pin %NAME|pressed" icon="\uf094" shim=input::onPinPressed
+    //% blockId=device_pin_event block="on pin %NAME|pressed" shim=input::onPinPressed
     function onPinPressed(name: TouchPin, body: () => void): void;
 
     /**
@@ -255,7 +255,7 @@ declare namespace input {
      * @param body the code to run when the pin is released
      */
     //% help=input/on-pin-released weight=6 blockGap=8
-    //% blockId=device_pin_released block="on pin %NAME|released" icon="\uf094"
+    //% blockId=device_pin_released block="on pin %NAME|released"
     //% advanced=true shim=input::onPinReleased
     function onPinReleased(name: TouchPin, body: () => void): void;
 
@@ -265,7 +265,7 @@ declare namespace input {
     //% help=input/button-is-pressed weight=60
     //% block="button|%NAME|is pressed"
     //% blockId=device_get_button2
-    //% icon="\uf192" blockGap=8
+    //% blockGap=8
     //% parts="buttonpair" shim=input::buttonIsPressed
     function buttonIsPressed(button: Button): boolean;
 
@@ -274,7 +274,7 @@ declare namespace input {
      * @param name pin used to detect the touch
      */
     //% help=input/pin-is-pressed weight=58
-    //% blockId="device_pin_is_pressed" block="pin %NAME|is pressed" icon="\uf094"
+    //% blockId="device_pin_is_pressed" block="pin %NAME|is pressed"
     //% blockGap=8 shim=input::pinIsPressed
     function pinIsPressed(name: TouchPin): boolean;
 
@@ -282,7 +282,7 @@ declare namespace input {
      * Get the acceleration value in milli-gravitys (when the board is laying flat with the screen up, x=0, y=0 and z=-1024)
      * @param dimension TODO
      */
-    //% help=input/acceleration weight=58 icon="\uf135"
+    //% help=input/acceleration weight=58
     //% blockId=device_acceleration block="acceleration (mg)|%NAME" blockGap=8
     //% parts="accelerometer" shim=input::acceleration
     function acceleration(dimension: Dimension): number;
@@ -291,7 +291,7 @@ declare namespace input {
      * Reads the light level applied to the LED screen in a range from ``0`` (dark) to ``255`` bright.
      */
     //% help=input/light-level weight=57
-    //% blockId=device_get_light_level block="light level" blockGap=8 icon="\uf185"
+    //% blockId=device_get_light_level block="light level" blockGap=8
     //% parts="ledmatrix" shim=input::lightLevel
     function lightLevel(): number;
 
@@ -299,7 +299,7 @@ declare namespace input {
      * Get the current compass heading in degrees.
      */
     //% help=input/compass-heading
-    //% weight=56 icon="\uf14e"
+    //% weight=56
     //% blockId=device_heading block="compass heading (°)" blockGap=8
     //% parts="compass" shim=input::compassHeading
     function compassHeading(): number;
@@ -307,7 +307,7 @@ declare namespace input {
     /**
      * Gets the temperature in Celsius degrees (°C).
      */
-    //% weight=55 icon="\uf06d"
+    //% weight=55
     //% help=input/temperature
     //% blockId=device_temperature block="temperature (°C)" blockGap=8
     //% parts="thermometer" shim=input::temperature
@@ -318,7 +318,7 @@ declare namespace input {
      * @param kind TODO
      */
     //% help=input/rotation weight=52
-    //% blockId=device_get_rotation block="rotation (°)|%NAME" blockGap=8 icon="\uf197"
+    //% blockId=device_get_rotation block="rotation (°)|%NAME" blockGap=8
     //% parts="accelerometer" advanced=true shim=input::rotation
     function rotation(kind: Rotation): number;
 
@@ -327,7 +327,7 @@ declare namespace input {
      * @param dimension TODO
      */
     //% help=input/magnetic-force weight=51
-    //% blockId=device_get_magnetic_force block="magnetic force (µT)|%NAME" blockGap=8 icon="\uf076"
+    //% blockId=device_get_magnetic_force block="magnetic force (µT)|%NAME" blockGap=8
     //% parts="compass"
     //% advanced=true shim=input::magneticForce
     function magneticForce(dimension: Dimension): number;
@@ -336,7 +336,7 @@ declare namespace input {
      * Gets the number of milliseconds elapsed since power on.
      */
     //% help=input/running-time weight=50
-    //% blockId=device_get_running_time block="running time (ms)" icon="\uf017"
+    //% blockId=device_get_running_time block="running time (ms)"
     //% advanced=true shim=input::runningTime
     function runningTime(): number;
 
@@ -351,7 +351,7 @@ declare namespace input {
      * @param range a value describe the maximum strengh of acceleration measured
      */
     //% help=input/set-accelerometer-range
-    //% blockId=device_set_accelerometer_range block="set accelerometer|range %range" icon="\uf135"
+    //% blockId=device_set_accelerometer_range block="set accelerometer|range %range"
     //% weight=5
     //% parts="accelerometer"
     //% advanced=true shim=input::setAccelerometerRange
@@ -432,7 +432,7 @@ declare namespace control {
 
 
 
-    //% color=#8169E6 weight=35
+    //% color=#8169E6 weight=35 icon="\uf205"
 declare namespace led {
 
     /**
@@ -441,7 +441,7 @@ declare namespace led {
      * @param y TODO
      */
     //% help=led/plot weight=78
-    //% blockId=device_plot block="plot|x %x|y %y" icon="\uf205" blockGap=8
+    //% blockId=device_plot block="plot|x %x|y %y" blockGap=8
     //% parts="ledmatrix" shim=led::plot
     function plot(x: number, y: number): void;
 
@@ -451,7 +451,7 @@ declare namespace led {
      * @param y TODO
      */
     //% help=led/unplot weight=77
-    //% blockId=device_unplot block="unplot|x %x|y %y" icon="\uf204" blockGap=8
+    //% blockId=device_unplot block="unplot|x %x|y %y" blockGap=8
     //% parts="ledmatrix" shim=led::unplot
     function unplot(x: number, y: number): void;
 
@@ -461,7 +461,7 @@ declare namespace led {
      * @param y TODO
      */
     //% help=led/point weight=76
-    //% blockId=device_point block="point|x %x|y %y" icon="\uf10c"
+    //% blockId=device_point block="point|x %x|y %y"
     //% parts="ledmatrix" shim=led::point
     function point(x: number, y: number): boolean;
 
@@ -469,7 +469,7 @@ declare namespace led {
      * Get the screen brightness from 0 (off) to 255 (full bright).
      */
     //% help=led/brightness weight=60
-    //% blockId=device_get_brightness block="brightness" icon="\uf042" blockGap=8
+    //% blockId=device_get_brightness block="brightness" blockGap=8
     //% parts="ledmatrix"
     //% advanced=true shim=led::brightness
     function brightness(): number;
@@ -479,7 +479,7 @@ declare namespace led {
      * @param value the brightness value, eg:255, 127, 0
      */
     //% help=led/set-brightness weight=59
-    //% blockId=device_set_brightness block="set brightness %value" icon="\uf042"
+    //% blockId=device_set_brightness block="set brightness %value"
     //% parts="ledmatrix"
     //% advanced=true shim=led::setBrightness
     function setBrightness(value: number): void;
@@ -488,7 +488,7 @@ declare namespace led {
      * Cancels the current animation and clears other pending animations.
      */
     //% weight=50 help=led/stop-animation
-    //% blockId=device_stop_animation block="stop animation" icon="\uf04d"
+    //% blockId=device_stop_animation block="stop animation"
     //% parts="ledmatrix"
     //% advanced=true shim=led::stopAnimation
     function stopAnimation(): void;
@@ -504,7 +504,7 @@ declare namespace led {
     /**
      * Turns on or off the display    
      */
-    //% help=led/enable blockId=device_led_enable icon="\uf04d"
+    //% help=led/enable blockId=device_led_enable
     //% advanced=true parts="ledmatrix" shim=led::enable
     function enable(on: boolean): void;
 
@@ -520,7 +520,7 @@ declare namespace led {
     /**
      * Blocks to control the onboard motors
      */
-    //% color=#008272 weight=30
+    //% color=#008272 weight=30 icon="\uf1b9"
 declare namespace motors {
 
     /**
diff --git a/libs/radio/radio.ts b/libs/radio/radio.ts
index f24c4452..4a5b1a71 100644
--- a/libs/radio/radio.ts
+++ b/libs/radio/radio.ts
@@ -1,7 +1,7 @@
 /**
  * Communicate data using radio packets
  */
-//% color=#E3008C weight=34
+//% color=#E3008C weight=34 icon="\uf012"
 namespace radio {
     export class Packet {
         /**