diff --git a/awx/ui/static/js/main-menu/menu-default.partial.html b/awx/ui/static/js/main-menu/menu-default.partial.html
index 25014f67ef..211ec81bcc 100644
--- a/awx/ui/static/js/main-menu/menu-default.partial.html
+++ b/awx/ui/static/js/main-menu/menu-default.partial.html
@@ -11,20 +11,30 @@
     Jobs
 </a>
 <a href="/#/users/{{currentUser.id}}" class="MenuItem MenuItem--right MenuItem--fixed MenuItem-username">
-  <img src="/static/img/User.svg" class="MenuItem-icon MenuItem-icon--labelled">
+  <i class="MenuItem-icon MenuItem-icon--labelled">
+    <aw-icon name="User"></aw-icon>
+  </i>
   <span class="u-truncatedText">
     {{currentUser.username}}
   </span>
 </a>
 <a href="#/setup" class="MenuItem MenuItem--fixed">
-    <img title="Setup" data-placement="bottom" src="/static/img/Setup.svg" class="MenuItem-icon">
-    <span class="MenuItem-helpTitle">Setup</span>
+  <i class="MenuItem-icon" title="Setup" data-placement="bottom">
+    <aw-icon name="Setup"></aw-icon>
+  </i>
+  <span class="MenuItem-helpTitle">Setup</span>
 </a>
 <a portal-mode-link class="MenuItem MenuItem--fixed">
-    <img src="/static/img/PortalMode.svg" title="Portal Mode" data-placement="bottom" class="MenuItem-icon">
+  <i class="MenuItem-icon" title="Portal Mode" data-placement="bottom">
+    <aw-icon name="PortalMode"></aw-icon>
+    <!-- <img src="/static/img/PortalMode.svg" title="Portal Mode" data-placement="bottom" class="MenuItem-icon"> -->
+  </i>
     <span class="MenuItem-helpTitle">Portal Mode</span>
 </a>
-<a href="#/logout"class="MenuItem MenuItem--fixed MenuItem-signout">
-  <img src="/static/img/Signout.svg"  title="Sign out" data-placement="bottom" class="MenuItem-icon">
-  <span class="MenuItem-helpTitle">Sign Out</span>
+<a href="#/logout"class="MenuItem MenuItem--fixed">
+  <i class="MenuItem-icon" title="Sign Out" data-placement="bottom">
+    <aw-icon name="Signout"></aw-icon>
+    <!-- <img src="/static/img/Signout.svg"  title="Sign out" data-placement="bottom" class="MenuItem-icon"> -->
+  </i>
+  <span class="MenuItem-helpTitle" data-placement="bottom">Sign Out</span>
 </a>
diff --git a/awx/ui/static/js/shared/menu/menu-item.block.less b/awx/ui/static/js/shared/menu/menu-item.block.less
index 4a7f5acf8d..68939b2db5 100644
--- a/awx/ui/static/js/shared/menu/menu-item.block.less
+++ b/awx/ui/static/js/shared/menu/menu-item.block.less
@@ -39,7 +39,10 @@
   &--fixed {
       flex: none;
       min-width: 0;
-      margin-right: 0 !important;
+      margin-right: 0;
+      @media screen and (min-width: 571px) {
+          padding: 0 0.75rem;
+      }
   }
 
   &-helpTitle {
@@ -97,9 +100,11 @@
   }
 
   &-icon {
-      height: 13px;
+      height: 17px;
       width: auto;
+      max-width: 18px;
       flex: none;
+      box-sizing: initial;
       &--labelled {
           margin-right: 0.25rem;
       }
@@ -119,10 +124,4 @@
       }
   }
 
-  &-signout {
-      @media screen and (min-width: 571px) {
-          padding-left: 0.25rem;
-      }
-  }
-
 }