diff --git a/core/client/assets/fonts/icons.svg b/core/client/assets/fonts/icons.svg
index fad45f9e3c..7ff67a6e8c 100755
--- a/core/client/assets/fonts/icons.svg
+++ b/core/client/assets/fonts/icons.svg
@@ -72,4 +72,6 @@
 <glyph unicode="&#xe03e;" d="M201.497 327.805l-49.946 40.108-147.561-140.715 148.97-140.709 49.953 40.108-107.2 100.601 105.782 100.607zM376.533 367.913l-49.945-40.101 107.192-100.6-105.782-100.607 49.945-40.116 147.561 140.723-148.97 140.701z" horiz-adv-x="527" />
 <glyph unicode="&#xe11d;" d="M368.615 40.499c6.861-6.938 6.861-18.125 0-25.063s-17.945-6.938-24.807 0l-200.448 202.419c-6.861 6.938-6.861 18.151 0 25.063l200.448 202.445c6.861 6.938 17.945 6.938 24.807 0s6.861-18.125 0-25.063l-182.784-189.901 182.784-189.901z" />
 <glyph unicode="&#xe600;" d="M743.538 230.236v0c-0.062-49.405-16.655-89.42-66.414-89.42-49.755 0-66.355 40.016-66.407 89.42v0.245c0.052 49.404 16.652 89.416 66.41 89.416 49.755 0 66.348-40.012 66.41-89.416v-0.245zM677.124 369.593c-87.786 0-133.124-62.281-133.124-139.112s44.221-139.115 133.124-139.115c88.904 0 133.128 62.284 133.128 139.115s-45.345 139.112-133.128 139.112v0zM288 89.17v384.616c0 0 50.565 7.206 54.486 7.736 4.442 0.602 10.338-2.57 10.338-8.842v-142.582c10.497 10.008 22.048 18.075 34.642 24.226 12.603 6.14 27.386 9.216 44.362 9.216 14.7 0 27.724-2.501 39.096-7.511 11.383-4.995 20.876-12.022 28.486-21.058 7.611-9.046 13.383-19.84 17.324-32.391 3.934-12.551 5.904-26.371 5.904-41.472v-171.938h-64.827v171.938c0 16.498-3.803 29.271-11.417 38.317-7.614 9.036-19.031 13.558-34.258 13.558-11.197 0-21.69-2.542-31.483-7.642-9.807-5.089-19.079-12.018-27.827-20.798v-195.373h-64.824zM1162.845 78.954c-44.607 0-72.565 26.050-72.565 74.642v144.007h-50.28c0 0 10.686 37.078 11.531 40.001 0.849 2.917 3.059 6.047 7.496 6.667s31.186 4.363 31.186 4.363l12.355 78.858c0 0 36.3 5.134 42.055 5.995 5.435 0.817 10.362-3.113 10.362-9.050v-75.803h63.59v-51.031h-63.59v-142.070c0-19.397 11.773-26.811 23.055-26.811 6.897 0 16.341 3.678 23.389 6.954 4.355 2.021 11.103 0.522 12.845-5.577 1.545-5.404 9.742-34.086 9.742-34.086-7.072-4.58-29.428-17.058-61.172-17.058zM996.193 309.323c-12.635 4.117-36.38 10.707-58.969 10.707-23.017 0-41.128-7.978-41.128-27.178 0-23.981 39.031-30.966 65.749-40.739 17.862-6.535 65.766-19.276 65.766-70.961 0-62.786-51.972-89.627-107.41-89.627-55.445 0-88.2 20.691-88.2 20.691s8.6 30.474 10.341 36.494c1.576 5.414 7.851 7.313 11.845 5.774 14.265-5.518 40.034-13.191 69.155-13.191 29.486 0 43.755 9.033 43.755 28.288 0 25.627-39.817 33.46-66.152 41.793-18.138 5.736-66.155 19.113-66.155 75.952 0 55.995 49.010 82.266 101.389 82.266 44.338 0 66.086-9.303 82.331-17.605 0 0-9.052-31.65-10.396-36.366-1.593-5.597-6.176-8.168-11.92-6.299zM134.203 225.292c-29.176 0-51.934 15.547-51.934 49.457 0 33.916 22.783 49.464 51.934 49.464 29.159 0 51.941-15.505 51.941-49.464 0-33.954-22.755-49.457-51.941-49.457v0zM99.566 94.639c0 0 32.342-1.228 64.658-2.729 36.307-1.685 47.62-9.534 47.62-28.395 0-23.043-31.552-45.457-75.645-45.457-41.855 0-62.762 14.61-62.762 38.933 0 13.956 7.345 29.568 26.127 37.649v0zM269.286 360.073c0 6.058-5.159 9.52-10.079 8.957-21.755-2.501-37.276-12.773-47.317-22.331-19.717 15.499-47.086 22.894-77.807 22.894-61.586 0-109.704-29.817-109.704-94.844 0-37.324 15.834-63.045 40.986-78.187-18.68-8.873-31.12-27.693-31.12-46.197 0-30.955 24.376-40.649 24.376-40.649s-42.62-20.753-42.62-62.274c0-53.151 48.755-74.642 108.331-74.642 85.873 0 144.955 35.584 144.955 100.923 0 40.213-30.669 62.412-97.514 65.052-39.666 1.57-65.359 3.003-71.721 5.116-8.41 2.802-12.545 9.558-12.545 17.017 0 8.233 6.742 16.076 17.365 21.455 9.269-1.643 19.052-2.459 29.21-2.459 61.638 0 109.71 29.734 109.71 94.844 0 15.793-2.841 29.499-8.007 41.206 9.055 4.846 20.196 8.257 33.5 8.257v35.861z" horiz-adv-x="1232" />
+<glyph unicode="&#xe601;" d="M450.252 353.683c-12.127 20.971-39.34 31.134-75.468 31.134-16.973 0-35.91-2.238-56.18-6.656-19.779 61.791-51.411 101.769-87.040 101.769s-67.262-39.978-87.040-101.769c-20.2 4.418-39.136 6.656-56.109 6.656-18.096 0-33.876-2.518-46.711-7.715-12.828-5.19-22.718-12.905-28.756-23.426-17.815-30.86 0.982-78.273 44.537-126.246-43.555-47.974-62.352-95.387-44.537-126.247 12.133-21.041 39.347-31.134 75.468-31.134 16.973 0 35.91 2.238 56.109 6.656 19.779-61.791 51.411-101.769 87.040-101.769s67.262 39.978 87.040 101.769c20.269-4.418 39.207-6.656 56.109-6.656 36.19 0 63.404 10.163 75.538 31.134 17.815 30.861-0.982 78.273-44.601 126.246 43.625 47.98 62.415 95.393 44.601 126.254v0zM88.415 98.111c-26.224 0-44.88 6.242-51.2 17.106-8.136 14.168 0.982 41.942 23.846 72.592 4.902 6.522 10.31 13.046 16.131 19.575 14.519-13.887 31.001-27.571 49.096-40.757 2.384-22.233 5.961-43.344 10.731-62.842-17.387-3.717-33.799-5.674-48.605-5.674v0zM123.561 203.948c-9.538 7.715-18.523 15.57-26.862 23.496 8.34 7.925 17.324 15.781 26.862 23.496-0.281-7.778-0.491-15.571-0.491-23.496s0.21-15.788 0.491-23.496v0zM126.296 288.245c-18.096-13.186-34.578-26.933-49.096-40.757-5.822 6.53-11.229 13.053-16.132 19.575-22.871 30.643-31.989 58.424-23.846 72.592 6.313 10.871 24.976 17.106 51.2 17.106 14.799 0 31.211-1.957 48.612-5.681-4.784-19.491-8.353-40.603-10.738-62.836v0zM305.916 309.216c-6.53 4.138-13.193 8.206-20.058 12.204-6.873 3.928-13.676 7.645-20.55 11.222 11.433 4.418 22.717 8.276 33.736 11.51 2.595-10.949 4.98-22.521 6.873-34.935v0zM231.571 451.875c19.007 0 42.994-29.38 59.827-80.728-19.288-5.688-39.347-13.046-59.827-22.093-20.41 9.125-40.538 16.412-59.757 22.093 16.826 51.348 40.75 80.728 59.757 80.728v0zM164.162 344.222c11.012-3.303 22.31-7.161 33.743-11.572-6.874-3.577-13.747-7.294-20.55-11.222-6.874-3.998-13.543-8.066-20.13-12.204 1.957 12.407 4.272 23.98 6.936 34.998v0zM157.226 145.657c6.586-4.138 13.256-8.206 20.13-12.204 6.803-3.928 13.669-7.645 20.55-11.222-11.433-4.418-22.725-8.276-33.743-11.572-2.665 10.942-4.98 22.591-6.936 34.998v0zM231.571 2.998c-19.007 0-42.924 29.38-59.756 80.728 19.21 5.688 39.276 12.976 59.757 22.093 20.48-9.125 40.538-16.412 59.827-22.093-16.841-51.341-40.819-80.728-59.827-80.728v0zM299.043 110.659c-11.012 3.303-22.303 7.161-33.736 11.572 6.866 3.577 13.669 7.294 20.55 11.222 6.866 3.998 13.536 8.066 20.058 12.204-1.894-12.407-4.279-23.987-6.873-34.998v0zM310.195 182.058c-12.204-8.409-25.039-16.546-38.365-24.26s-26.792-14.729-40.258-21.041c-13.396 6.313-26.863 13.326-40.181 21.041-13.396 7.715-26.231 15.851-38.372 24.26-1.192 14.455-1.893 29.534-1.893 45.386s0.702 30.931 1.893 45.386c12.204 8.41 24.976 16.546 38.372 24.261 13.319 7.715 26.786 14.729 40.181 21.041 13.466-6.313 26.932-13.326 40.258-21.041 13.319-7.715 26.154-15.851 38.365-24.261 1.192-14.455 1.824-29.535 1.824-45.386s-0.638-30.938-1.824-45.386v0zM374.791 356.769c26.231 0 44.887-6.242 51.13-17.106 8.206-14.168-0.912-41.942-23.839-72.592-4.839-6.522-10.24-13.046-16.062-19.575-14.519 13.824-31 27.571-49.096 40.757-2.392 22.233-6.032 43.344-10.731 62.843 17.38 3.71 33.799 5.674 48.598 5.674v0zM339.582 250.933c9.531-7.715 18.516-15.571 26.863-23.496-8.346-7.926-17.331-15.78-26.863-23.496 0.351 7.715 0.484 15.57 0.484 23.496s-0.134 15.78-0.484 23.496v0zM425.984 115.217c-6.305-10.871-24.969-17.106-51.27-17.106-14.729 0-31.14 1.957-48.535 5.681 4.7 19.498 8.339 40.609 10.731 62.843 18.096 13.186 34.577 26.863 49.096 40.757 5.822-6.53 11.222-13.053 16.062-19.575 22.942-30.65 32.053-58.431 23.916-72.599v0zM267.755 227.436c0-19.972-16.19-36.162-36.162-36.162s-36.162 16.19-36.162 36.162c0 19.972 16.19 36.162 36.162 36.162s36.162-16.19 36.162-36.162z" horiz-adv-x="463" />
+<glyph unicode="&#xe602;" d="M253.749 473.772c-139.453 0-252.493-113.040-252.493-252.493s113.047-252.493 252.493-252.493c139.439 0 252.486 113.040 252.486 252.493s-113.040 252.493-252.486 252.493v0zM253.749 24.895c-108.285 0-196.383 88.099-196.383 196.384s88.099 196.384 196.383 196.384c108.278 0 196.376-88.099 196.376-196.384s-88.092-196.384-196.376-196.384v0zM214.837 261.558l-0.014-0.028-0.028-0.014 0.014-0.021-83.035-161.799 161.988 82.93 1.375 2.413 81.647 159.415-161.946-82.895zM229.706 246.605l49.089-49.089-97.771-48.633 48.682 97.722z" />
 </font></defs></svg>
\ No newline at end of file
diff --git a/core/client/assets/fonts/icons.woff b/core/client/assets/fonts/icons.woff
index 35996d6722..798fd156fb 100755
Binary files a/core/client/assets/fonts/icons.woff and b/core/client/assets/fonts/icons.woff differ
diff --git a/core/client/assets/sass/layouts/settings.scss b/core/client/assets/sass/layouts/settings.scss
index b7227a46c8..3c1b7ba7d1 100644
--- a/core/client/assets/sass/layouts/settings.scss
+++ b/core/client/assets/sass/layouts/settings.scss
@@ -131,6 +131,11 @@
 
 } // .settings-nav
 
+// Special cases for nav items
+.settings-nav-labs .icon-labs:before {
+    font-size: 16px;
+}
+
 
 //
 // Content
diff --git a/core/client/assets/sass/modules/icons.scss b/core/client/assets/sass/modules/icons.scss
index c1ba41e3b2..cd8bdb00c0 100755
--- a/core/client/assets/sass/modules/icons.scss
+++ b/core/client/assets/sass/modules/icons.scss
@@ -14,6 +14,7 @@
 // * Icon Variables
 // * Icon Class Styles
 // * Icon Classes
+// * Div-based Icon Classes
 // ------------------------------------------------------------
 
 
@@ -172,6 +173,8 @@ $i-weather-snow:    \e03b;
 $i-weather-cloudy:  \e03c;
 $i-lightning:       \e03d;
 $i-code:            \e03e;
+$i-atom:            \e601;
+$i-compass:         \e602;
 
 
 //
@@ -384,4 +387,29 @@ $i-code:            \e03e;
 }
 .icon-lightning:before {
     content: '#{$i-lightning}';
+}
+.icon-atom:before {
+    content: '#{$i-atom}';
+}
+.icon-compass:before {
+    content: '#{$i-compass}';
+}
+
+
+//
+// Div-based Icon Classes
+// --------------------------------------------------
+
+.icon-grab:before {
+    content: '';
+    display: inline-block;
+    width: 7px;
+    height: 15px;
+    background-size: 4px 4px;
+    background-color: $midbrown;
+    background-position: -1px -1px;
+    background-image: linear-gradient(#fff 1px, transparent 1px),
+        linear-gradient(90deg, #fff 1px, transparent 1px),
+        linear-gradient(#fff 1px, transparent 1px),
+        linear-gradient(90deg, #fff 1px, transparent 1px);
 }
\ No newline at end of file