diff --git a/ui/src/app/components/menu-link.tpl.html b/ui/src/app/components/menu-link.tpl.html
index 19e99c8783..c5e497c9e7 100644
--- a/ui/src/app/components/menu-link.tpl.html
+++ b/ui/src/app/components/menu-link.tpl.html
@@ -17,6 +17,6 @@
 -->
 <md-button 
 	ui-sref-active-eq="tb-active" ui-sref="{{section.state}}">
-	<md-icon ng-show="{{section.icon != null}}" aria-label="{{section.icon}}" class="material-icons">{{section.icon}}</md-icon>	
+	<md-icon ng-show="section.icon != null" aria-label="{{section.icon}}" class="material-icons">{{section.icon}}</md-icon>
 	{{section.name | translate}}
 </md-button>
\ No newline at end of file
diff --git a/ui/src/app/components/menu-toggle.tpl.html b/ui/src/app/components/menu-toggle.tpl.html
index 454b46266e..6303c3bbc3 100644
--- a/ui/src/app/components/menu-toggle.tpl.html
+++ b/ui/src/app/components/menu-toggle.tpl.html
@@ -20,8 +20,8 @@
     class="md-button-toggle"
 	aria-controls="docs-menu-{{section.name | nospace}}" layout="row"
 	aria-expanded="{{sectionActive()}}">
-	<md-icon ng-show="{{section.icon != null}}" aria-label="{{section.icon}}" class="material-icons">{{section.icon}}</md-icon>	
-	{{section.name | translate}}
+	<md-icon ng-show="section.icon != null" aria-label="{{section.icon}}" class="material-icons">{{section.icon}}</md-icon>
+	<span flex>{{section.name | translate}}</span>
 	<span aria-hidden="true" 
 	class=" pull-right fa fa-chevron-down md-toggle-icon"
 	ng-class="{'tb-toggled' : sectionActive()}"></span>
diff --git a/ui/src/app/components/side-menu.scss b/ui/src/app/components/side-menu.scss
index 76b054d694..58cde01a9f 100644
--- a/ui/src/app/components/side-menu.scss
+++ b/ui/src/app/components/side-menu.scss
@@ -55,7 +55,7 @@
 }
 
 .tb-side-menu .md-button {
-  display: block;
+  display: flex;
   border-radius: 0;
   color: inherit;
   cursor: pointer;
@@ -66,8 +66,14 @@
   padding: 0px 16px;
   text-align: left;
   text-decoration: none;
-  white-space: normal;
+  white-space: nowrap;
+  text-overflow: ellipsis;
   width: 100%;
+  span {
+    overflow: hidden;
+    white-space: nowrap;
+    text-overflow: ellipsis;
+  }
 }
 
 .tb-side-menu tb-menu-link span.md-toggle-icon {
@@ -77,8 +83,10 @@
 
 .tb-side-menu ng-md-icon {
   margin-right: 8px;
+  margin-left: 0px;
 }
 
 .tb-side-menu md-icon {
   margin-right: 8px;
+  margin-left: 0px;
 }
diff --git a/ui/src/scss/main.scss b/ui/src/scss/main.scss
index 7720c8210e..076dbef296 100644
--- a/ui/src/scss/main.scss
+++ b/ui/src/scss/main.scss
@@ -274,6 +274,14 @@ pre.tb-highlight {
   md-toolbar {
     z-index: 0;
   }
+  md-toolbar.md-table-toolbar.md-default-theme:not(.md-menu-toolbar).md-default .md-button[disabled],
+  md-toolbar.md-table-toolbar:not(.md-menu-toolbar).md-default .md-button[disabled] {
+    color: rgba(0,0,0,0.38);
+  }
+  md-toolbar.md-default-theme:not(.md-menu-toolbar) .md-button[disabled] md-icon,
+  md-toolbar:not(.md-menu-toolbar) .md-button[disabled] md-icon {
+    color: rgba(0,0,0,.28);
+  }
   span.no-data-found {
     position: relative;
     height: calc(100% - 57px);