diff --git a/platform/features/fixed/bundle.js b/platform/features/fixed/bundle.js
index 121501588b..7561a3a623 100644
--- a/platform/features/fixed/bundle.js
+++ b/platform/features/fixed/bundle.js
@@ -36,7 +36,7 @@ define([
                 {
                     "key": "fixed-display",
                     "name": "Fixed Position Display",
-                    "glyph": "3",
+                    "cssclass": "icon-telemetry-panel",
                     "type": "telemetry.fixed",
                     "template": fixedTemplate,
                     "uses": [
@@ -49,28 +49,28 @@ define([
                                 "items": [
                                     {
                                         "method": "add",
-                                        "glyph": "\u002b",
+                                        "cssclass": "icon-plus",
                                         "control": "menu-button",
                                         "text": "Add",
                                         "options": [
                                             {
                                                 "name": "Box",
-                                                "glyph": "\u00e0",
+                                                "cssclass": "icon-box",
                                                 "key": "fixed.box"
                                             },
                                             {
                                                 "name": "Line",
-                                                "glyph": "\u00e2",
+                                                "cssclass": "icon-line-horz",
                                                 "key": "fixed.line"
                                             },
                                             {
                                                 "name": "Text",
-                                                "glyph": "\u00e4",
+                                                "cssclass": "icon-T",
                                                 "key": "fixed.text"
                                             },
                                             {
                                                 "name": "Image",
-                                                "glyph": "\u00e3",
+                                                "cssclass": "icon-image",
                                                 "key": "fixed.image"
                                             }
                                         ]
@@ -81,52 +81,61 @@ define([
                                 "items": [
                                     {
                                         "method": "order",
-                                        "glyph": "á",
+                                        "cssclass": "icon-layers",
                                         "control": "menu-button",
+                                        "title": "Layering",
+                                        "description": "Move the selected object above or below other objects",
                                         "options": [
                                             {
                                                 "name": "Move to Top",
-                                                "glyph": "\u00eb",
+                                                "cssclass": "icon-arrow-double-up",
                                                 "key": "top"
                                             },
                                             {
                                                 "name": "Move Up",
-                                                "glyph": "\u005e",
+                                                "cssclass": "icon-arrow-up",
                                                 "key": "up"
                                             },
                                             {
                                                 "name": "Move Down",
-                                                "glyph": "\u0076",
+                                                "cssclass": "icon-arrow-down",
                                                 "key": "down"
                                             },
                                             {
                                                 "name": "Move to Bottom",
-                                                "glyph": "\u00ee",
+                                                "cssclass": "icon-arrow-double-down",
                                                 "key": "bottom"
                                             }
                                         ]
                                     },
                                     {
                                         "property": "fill",
-                                        "glyph": "",
+                                        "cssclass": "icon-paint-bucket",
+                                        "title": "Fill color",
+                                        "description": "Set fill color",
                                         "control": "color"
                                     },
                                     {
                                         "property": "stroke",
-                                        "glyph": "â",
+                                        "cssclass": "icon-line-horz",
+                                        "title": "Border color",
+                                        "description": "Set border color",
                                         "control": "color"
                                     },
                                     {
                                         "property": "color",
-                                        "glyph": "ä",
+                                        "cssclass": "icon-T",
+                                        "title": "Text color",
+                                        "description": "Set text color",
                                         "mandatory": true,
                                         "control": "color"
                                     },
                                     {
                                         "property": "url",
-                                        "glyph": "ã",
+                                        "cssclass": "icon-image",
                                         "control": "dialog-button",
                                         "title": "Image Properties",
+                                        "description": "Edit image properties",
                                         "dialog": {
                                             "control": "textfield",
                                             "name": "Image URL",
@@ -135,9 +144,10 @@ define([
                                     },
                                     {
                                         "property": "text",
-                                        "glyph": "G",
+                                        "cssclass": "icon-gear",
                                         "control": "dialog-button",
                                         "title": "Text Properties",
+                                        "description": "Edit text properties",
                                         "dialog": {
                                             "control": "textfield",
                                             "name": "Text",
@@ -146,15 +156,17 @@ define([
                                     },
                                     {
                                         "method": "showTitle",
-                                        "glyph": "ç",
+                                        "cssclass": "icon-two-parts-both",
                                         "control": "button",
-                                        "description": "Show telemetry element title."
+                                        "title": "Show title",
+                                        "description": "Show telemetry element title"
                                     },
                                     {
                                         "method": "hideTitle",
-                                        "glyph": "å",
+                                        "cssclass": "icon-two-parts-one-only",
                                         "control": "button",
-                                        "description": "Hide telemetry element title."
+                                        "title": "Hide title",
+                                        "description": "Hide telemetry element title"
                                     }
                                 ]
                             },
@@ -163,7 +175,7 @@ define([
                                     {
                                         "method": "remove",
                                         "control": "button",
-                                        "glyph": "Z"
+                                        "cssclass": "icon-trash"
                                     }
                                 ]
                             }
@@ -175,7 +187,7 @@ define([
                 {
                     "key": "telemetry.fixed",
                     "name": "Fixed Position Display",
-                    "glyph": "3",
+                    "cssclass": "icon-telemetry-panel",
                     "description": "A panel for collecting telemetry" +
                     " elements in a fixed position display.",
                     "priority": 899,