diff --git a/web/gui/src/main/webapp/app/fw/svg/glyphData.js b/web/gui/src/main/webapp/app/fw/svg/glyphData.js
index b6f5b38..fbceca1 100644
--- a/web/gui/src/main/webapp/app/fw/svg/glyphData.js
+++ b/web/gui/src/main/webapp/app/fw/svg/glyphData.js
@@ -566,6 +566,50 @@
             'M70.4,31c11.8-10.4,26.2-5.2,24.7,10.1'
         },
 
+
+        // --- Mojo Re-Design ---------------------------------------
+
+        m_switch_arrows = 'M62.1,64.3l13-7.2-13-7c0,1.1,0,2,0,3' +
+            'a1.9,1.9,0,0,1-2.2,2.2H53.2V59h1.5A2,2,0,0,1,56.8,61' +
+            'a1.9,1.9,0,0,1-2.1,1.9H51.4a1.9,1.9,0,0,1-2-2.1q0-3.5,0-7' +
+            'c0-1.6.7-2.3,2.4-2.3h6.6c0-1.1,0-2.1,0-3.1s0-.8,0-1.2' +
+            'a1.9,1.9,0,0,1,2.9-1.8l5.4,2.9,13,7' +
+            'a2.2,2.2,0,0,1,1.5,1.9,2.2,2.2,0,0,1-1.5,2L61.7,68.9' +
+            'a2.2,2.2,0,0,1-2.5.2,1.8,1.8,0,0,1-.9-1.6c0-2.2,0-4.4,0-6.6' +
+            'a1.8,1.8,0,0,1,1.9-1.9,1.8,1.8,0,0,1,2,1.9' +
+            'C62.2,62,62.1,63.1,62.1,64.3ZM41.7,64.4h6.5c1.8,0,2.5.7,2.5,2.4' +
+            's0,4.4,0,6.6-0.7,2.3-2.3,2.3H45.2a2,2,0,0,1-2-1.9' +
+            'A2,2,0,0,1,45.1,72h1.6V68.3H40.1a2,2,0,0,1-2.2-2.2c0-1,0-1.9,0-3' +
+            'L24.8,70l13.1,7.2c0-1.1,0-2.1,0-3a1.9,1.9,0,1,1,3.8,0' +
+            'c0,2,0,4,0,6.1a1.9,1.9,0,0,1-3,1.8L22.5,73.1l-2.3-1.3' +
+            'A2,2,0,0,1,18.9,70a2,2,0,0,1,1.3-1.9l14.4-7.7,4-2.1' +
+            'c1.7-.9,3.1,0,3.1,1.9S41.7,63,41.7,64.4Z' +
+            'M41.7,36.8h7.1a1.8,1.8,0,0,1,1.9,1.8q0,3.8,0,7.6' +
+            'a1.9,1.9,0,0,1-1.9,1.8H45.1a1.9,1.9,0,1,1,0-3.8h1.6V40.7H40.1' +
+            'a2,2,0,0,1-2.2-2.2c0-.9,0-1.8,0-2.7V35.5L24.8,42.4l13.1,7.2' +
+            'c0-1.1,0-2.1,0-3.1a1.9,1.9,0,0,1,1.9-2.1,1.9,1.9,0,0,1,1.9,2.1' +
+            'q0,3.1,0,6.1a1.9,1.9,0,0,1-3,1.8L25,46.9l-4.9-2.7' +
+            'a2,2,0,0,1-1.2-1.9,2,2,0,0,1,1.3-1.8l18.1-9.7' +
+            'a3.7,3.7,0,0,1,1.2-.5,1.8,1.8,0,0,1,2.2,2' +
+            'C41.7,33.8,41.7,35.3,41.7,36.8ZM58.3,23.9c0-1.5.1-3,0-4.4' +
+            'a2,2,0,0,1,3-1.8l18.5,9.9a2,2,0,0,1,0,3.7L61.5,41.5' +
+            'a2.1,2.1,0,0,1-3.3-1.9c0.1-2,0-4,0-6a1.9,1.9,0,1,1,3.8,0' +
+            'c0,1,0,2,0,3.1l13-7.2-13-7c0,1.1,0,2,0,2.9s-0.7,2.3-2.3,2.3' +
+            'H53.2v3.6l2,0.2a1.9,1.9,0,0,1,.7,3.4,2.2,2.2,0,0,1-1.1.3' +
+            'H51.3a1.9,1.9,0,0,1-2-2.1q0-3.6,0-7.2a1.9,1.9,0,0,1,2.1-2.1h6.9Z',
+
+        m_octagon = 'M50,92.9H33.7a3.2,3.2,0,0,1-2.5-1.1l-19.1-19L7.9,68.6' +
+            'A2.5,2.5,0,0,1,7,66.7Q7,49.9,7,33.2a2.6,2.6,0,0,1,.9-2L28.2,10.8' +
+            'l2.9-3a2.8,2.8,0,0,1,2.1-.9H66.6a2.5,2.5,0,0,1,1.5.6l6.3,6.2' +
+            'L92,31.1a2.8,2.8,0,0,1,.9,2.1q0,13.6.1,27.1c0,2,0,4,0,5.9' +
+            'a2.8,2.8,0,0,1-.9,2.2L68.6,92.2a2.6,2.6,0,0,1-2,.7H50Z' +
+            'M89.2,49.8H89.1c0-5.2,0-10.4,0-15.5a1.9,1.9,0,0,0-.5-1.2' +
+            'L66.7,11.3a1.8,1.8,0,0,0-1.4-.6H34.5a1.9,1.9,0,0,0-1.5.6' +
+            'L11.4,33.2a2,2,0,0,0-.5,1.3c0,10.3,0,20.5,0,30.8' +
+            'a1.9,1.9,0,0,0,.6,1.5L24.7,79.9l8.7,8.6a1.7,1.7,0,0,0,1.1.5' +
+            'H65.6a1.8,1.8,0,0,0,1.2-.5l21.9-22a2,2,0,0,0,.5-1.3' +
+            'C89.2,60.1,89.2,55,89.2,49.8Z',
+
         mojoDataSet = {
             _viewbox: '0 0 100 100',
 
@@ -622,7 +666,103 @@
             'A29.6,29.6,0,0,0,78.5,52.5a29.4,29.4,0,1,0-56.3-8.3,29,29,0,0,' +
             '0,6.5,15.5Zm14.7,23,1.7-25.6c-2.9,5-5.7,10.1-8.5,15.2' +
             'a0.9,0.9,0,0,0,.1.8l3.5,5.1Zm-2.2-27-0.2-.2' +
-            'C36.4,62.4,29.8,67.5,23,72.4h0.5l11.2,0.4a1,1,0,0,0,.7-0.5l5.3-9.5Z'
+            'C36.4,62.4,29.8,67.5,23,72.4h0.5l11.2,0.4a1,1,0,0,0,.7-0.5l5.3-9.5Z',
+
+            thatsNoMoon: 'M50,83.4A33.2,33.2,0,1,1,83.2,50.2,33.2,33.2,0,0,' +
+            '1,50,83.4ZM79.3,50.1A29.3,29.3,0,1,0,50.1,79.4,29.3,29.3,0,0,0,' +
+            '79.3,50.1ZM65.4,46.9h9.1A1.9,1.9,0,0,1,76.4,48a1.9,1.9,0,0,' +
+            '1-.3,2.1,2.1,2.1,0,0,1-1.8.7H65.4c-0.1.6-.1,1.2-0.2,1.8' +
+            'A38.5,38.5,0,0,1,57,73.9a2.1,2.1,0,0,1-2.2.9,2,2,0,0,' +
+            '1-1.4-1.6,2.3,2.3,0,0,1,.6-1.7,33.6,33.6,0,0,0,4.9-8.5,34.6,34.6,' +
+            '0,0,0,2.5-11c0-.3,0-0.7,0-1.1H38.9c0.2,1.3.3,2.6,0.5,3.9' +
+            'a34.2,34.2,0,0,0,7.3,17,2,2,0,1,1-3,2.4A37.1,37.1,0,0,1,39.1,67' +
+            'a40.8,40.8,0,0,1-4-15.5V50.8H25.8a2,2,0,0,1-2.2-1.9,1.9,1.9,0,0,' +
+            '1,2.1-2H35l0.3-1.8-0.8-.2a7.5,7.5,0,0,1-5.5-8.5,12.4,12.4,0,0,' +
+            '1,10-10.3,15.5,15.5,0,0,1,3.4,0,0.6,0.6,0,0,0,.7-0.3l0.8-1.1' +
+            'a1.9,1.9,0,0,1,2.5-.4,1.8,1.8,0,0,1,.7,2.4,13.6,13.6,0,0,' +
+            '1-.8,1.4,7.7,7.7,0,0,1,2.1,6.3A11,11,0,0,1,46,40.2a12.6,12.6,0,0,' +
+            '1-6.3,4.5,0.5,0.5,0,0,0-.5.6c0,0.5-.1,1-0.1,1.6H61.5l-0.7-4' +
+            'A33.6,33.6,0,0,0,53.5,27c-0.8-1-.9-1.7-0.4-2.5a1.7,1.7,0,0,' +
+            '1,2.4-.7,3.6,3.6,0,0,1,1.1.9,37,37,0,0,1,8,17.1' +
+            'c0.3,1.5.4,3,.7,4.4v0.7Zm-28.8-4A10.1,10.1,0,0,0,46,34.1' +
+            'a5.3,5.3,0,0,0-6-5.8A10.2,10.2,0,0,0,31.3,36' +
+            'C30.4,39.9,32.8,42.9,36.6,42.9ZM34.9,35.1a4,4,0,0,' +
+            '1,2.7-3.2,2.7,2.7,0,0,1,3.8,2.6,4.4,4.4,0,0,1-2.5,4' +
+            'C36.8,39.5,34.7,38,34.9,35.1Zm2,0.7c0,0.7.3,1,.9,0.9' +
+            'a2.3,2.3,0,0,0,1.5-2.3,0.7,0.7,0,0,0-1.1-.6' +
+            'A2.2,2.2,0,0,0,36.9,35.8Z',
+
+            mojo_ports: 'M35.3,37.7A6.8,6.8,0,0,1,40.2,40L59.5,59.3' +
+            'a2.5,2.5,0,0,0,3.7.2,2.4,2.4,0,0,0,0-3.7l-6.1-6.1' +
+            'a6.4,6.4,0,0,1,0-9.5L63,34.4a1.9,1.9,0,1,1,2.7,2.7l-5.8,5.8' +
+            'c-1.4,1.4-1.4,2.8,0,4.2l5.9,5.9a6.2,6.2,0,0,1,1.6,6.7' +
+            'A6.1,6.1,0,0,1,62,64.1a6.2,6.2,0,0,1-5.3-2L37.3,42.6' +
+            'a2.8,2.8,0,0,0-2-1,2.5,2.5,0,0,0-2.4,1.5,2.4,2.4,0,0,0,.5,2.7' +
+            'l4.6,4.6L40.6,53a6.4,6.4,0,0,1,.1,9L37,65.7A1.9,1.9,0,1,1,34.3,63' +
+            'l3.2-3.2c1.5-1.5,1.5-2.8,0-4.3l-6.8-6.8a6.4,6.4,0,0,1,3.1-10.7Z' +
+            'M85.6,22.9A4.7,4.7,0,0,1,84.4,26c-1.2,1.2-2.2,2.6-4,2.9' +
+            'a4.5,4.5,0,0,0-2,1l-5.1,3.7a3.9,3.9,0,0,1-5.3-.4l-1.2-1.2' +
+            'a3.9,3.9,0,0,1-.4-5.3l4.1-5.3a2.7,2.7,0,0,0,.5-1.1,4.7,4.7,0,0,' +
+            '1,1.2-2.7,17.3,17.3,0,0,1,2.4-2.3,4.8,4.8,0,0,1,6.2.6l3.3,3.3' +
+            'A5,5,0,0,1,85.6,22.9Zm-8.3-4.6-0.9.5-1.3,1.3a1,1,0,0,0,0,1.6' +
+            'l3.2,3.2a1.1,1.1,0,0,0,1.7,0l1.2-1.2a1.1,1.1,0,0,0,0-1.8' +
+            'l-3.1-3.1Zm-4.5,6.6-3.3,4.3,1.3,1.5,4.5-3.3ZM22.6,85.5a4.6,4.6,' +
+            '0,0,1-3-1.3l-3.6-3.6a4.7,4.7,0,0,1-.5-6,19.2,19.2,0,0,1,2.9-2.9,' +
+            '2.8,2.8,0,0,1,1.5-.6,4.8,4.8,0,0,0,2.5-1.2l4.5-3.4' +
+            'a4,4,0,0,1,5.4.3l1.1,1.1a3.9,3.9,0,0,1,.4,5.4l-4.1,5.5' +
+            'a1.9,1.9,0,0,0-.4.9,5,5,0,0,1-1.4,3l-1.7,1.7' +
+            'A4.8,4.8,0,0,1,22.6,85.5Zm2.9-6.4a3.3,3.3,0,0,0-.4-0.8l-3.3-3.3' +
+            'a1.1,1.1,0,0,0-1.6,0l-1.4,1.4a1.1,1.1,0,0,0,0,1.6l3.2,3.2' +
+            'a1.1,1.1,0,0,0,1.6,0l1.4-1.4A3.7,3.7,0,0,0,25.5,79.1Z' +
+            'm3.9-9.8-4.3,3.3,2.4,2.5,3.4-4.4Z',
+
+            mojo_switch: m_switch_arrows,
+
+            mojo_roadm: m_switch_arrows + m_octagon,
+
+            mojo_uiAttached: 'M50,22.2H73.6a5.3,5.3,0,0,1,5.6,5.6' +
+            'c-0.1,9.5,0,19,0,28.5a5.1,5.1,0,0,1-5.4,5.4H26.3' +
+            'a5.1,5.1,0,0,1-5.4-5.4q0-14.4,0-28.7a5,5,0,0,1,5.4-5.4H50Z' +
+            'M50.1,26H26.6c-1.5,0-1.8.3-1.8,1.8q0,14.2,0,28.3' +
+            'c0,1.3.4,1.7,1.7,1.7H73.7c1.4,0,1.7-.3,1.7-1.8q0-14.1,0-28.3' +
+            'c0-1.5-.3-1.8-1.8-1.8H50.1ZM48.2,74.1c0-2.7,0-5.3,0-7.9' +
+            'a1.9,1.9,0,1,1,3.8,0c0,2.3,0,4.7,0,7,0,0.3,0,.5,0,0.9h9.8' +
+            'A2,2,0,0,1,63.9,76a2,2,0,0,1-2.1,1.9H38.4' +
+            'a1.9,1.9,0,0,1-2-1.4,1.8,1.8,0,0,1,.7-2.1,2.6,2.6,0,0,1,1.3-.4' +
+            'h9.8Z',
+
+            mojo_summary: 'M20.6,50.1q0-12.7,0-25.3a5,5,0,0,1,4-5.1H74.5' +
+            'a5,5,0,0,1,5.2,5.2q0,25.3,0,50.6a5,5,0,0,1-5.3,5.3H25.8' +
+            'a5,5,0,0,1-5.1-5.2q0-9.6,0-19.2Q20.6,53.2,20.6,50.1Zm55.2,0.1' +
+            'q0-12.6,0-25.1c0-1.3-.3-1.6-1.6-1.6H26c-1.2,0-1.5.4-1.5,1.5' +
+            'q0,25.2,0,50.4c0,1.2.4,1.6,1.6,1.6H74c1.4,0,1.8-.3,1.8-1.7' +
+            'Q75.8,62.6,75.8,50.1ZM29.1,37.6q0-2,0-3.9a5,5,0,0,1,5.1-5.2h8' +
+            'a5,5,0,0,1,5.1,5.1q0,4,0,8a5,5,0,0,1-5,5.2H34.1a5,5,0,0,1-5-5.2' +
+            'Q29.1,39.6,29.1,37.6Zm9.1,5.3h4a1.2,1.2,0,0,0,1.3-1.3' +
+            'q0-3.9,0-7.9a1.2,1.2,0,0,0-1.3-1.3h-8a1.2,1.2,0,0,0-1.3,1.3' +
+            'q0,4,0,8a1.2,1.2,0,0,0,1.3,1.3h3.9ZM50.1,63.2h19' +
+            'a1.9,1.9,0,0,1,2,1.4,1.8,1.8,0,0,1-.9,2.1,3.8,3.8,0,0,1-1.6.3' +
+            'H31.3a2,2,0,0,1-2.2-1.7,1.9,1.9,0,0,1,2-2.2h19ZM50.1,57.6H31.3' +
+            'a3,3,0,0,1-1.3-.3,1.9,1.9,0,0,1,.3-3.4h39' +
+            'a1.9,1.9,0,0,1-.2,3.8H50.1Z',
+
+            mojo_detail: 'M33.8,78H26.2a4.9,4.9,0,0,1-4.7-2.3,6.5,6.5,0,0,' +
+            '1-.8-2.7c-0.1-1.7,0-3.4,0-5q0-22.6,0-45.3A5.7,5.7,0,0,1,22,18.4' +
+            'a4.8,4.8,0,0,1,3.6-1.5H74.5a4.9,4.9,0,0,1,5,4.9' +
+            'q0,14.6,0,29.3,0,10.8,0,21.6a5,5,0,0,1-3.3,5,5.8,5.8,0,0,1-2,.3' +
+            'H44.8c-1.4,0-2.3-.8-2.2-2a1.8,1.8,0,0,1,1.7-1.8H73.8' +
+            'c1.6,0,1.9-.3,1.9-1.8q0-24.9,0-49.8c0-1.5-.3-1.8-1.8-1.8H26.1' +
+            'c-1.4,0-1.7.3-1.7,1.7q0,25,0,49.9c0,1.4.3,1.7,1.7,1.7h9.6' +
+            'a0.8,0.8,0,0,0,.6-0.2l5.9-9.6H31.1a1.9,1.9,0,0,1-1.8-2.9,2,2,0,0,' +
+            '1,1.9-1H38a16.6,16.6,0,0,1-3.9-11.8H31a1.9,1.9,0,1,1,.1-3.8h3.2' +
+            'a0.9,0.9,0,0,0,1-.7A15.7,15.7,0,0,1,48,34,15.9,15.9,0,0,' +
+            '1,65.2,44.1a0.9,0.9,0,0,0,1,.7H69a1.9,1.9,0,1,1,0,3.8H66.2' +
+            'a16.6,16.6,0,0,1-3.9,11.8H69a1.9,1.9,0,0,1,2,2.5,1.8,1.8,0,0,' +
+            '1-1.9,1.3H58.1a4.2,4.2,0,0,0-1.6.3,15.7,15.7,0,0,1-9.8.9,0.9,0.9,' +
+            '0,0,0-1.2.5L33.3,86.3a2.1,2.1,0,0,1-2.2,1.3,1.9,1.9,0,0,1-1.3-3' +
+            'l3.5-5.8ZM62.4,49.9A12.2,12.2,0,1,0,50.1,62.1,12.2,12.2,0,0,' +
+            '0,62.4,49.9ZM50,29.1H68.9c1.7,0,2.7,1.6,1.8,2.9a3.6,3.6,0,0,' +
+            '1-1.4.9H31a1.9,1.9,0,1,1,.1-3.9H50Z'
         };
 
 
diff --git a/web/gui/src/main/webapp/tests/app/fw/svg/glyph-spec.js b/web/gui/src/main/webapp/tests/app/fw/svg/glyph-spec.js
index f9e8a83..050a9a5 100644
--- a/web/gui/src/main/webapp/tests/app/fw/svg/glyph-spec.js
+++ b/web/gui/src/main/webapp/tests/app/fw/svg/glyph-spec.js
@@ -21,7 +21,7 @@
 describe('factory: fw/svg/glyph.js', function() {
     var $log, fs, gs, d3Elem, svg;
 
-    var numBaseGlyphs = 54,
+    var numBaseGlyphs = 61,
         vbBird = '352 224 113 112',
         vbGlyph = '0 0 110 110',
         vbBadge = '0 0 10 10',