diff --git a/awx/ui/client/lib/components/layout/_index.less b/awx/ui/client/lib/components/layout/_index.less
index f45735c19a..9718aee233 100644
--- a/awx/ui/client/lib/components/layout/_index.less
+++ b/awx/ui/client/lib/components/layout/_index.less
@@ -116,6 +116,10 @@
                     width: 50px;
                 }
 
+                i.is-no-tooltip {
+                    padding-left: @at-padding-left-side-nav-item-icon-no-tooltip;
+                }
+
                 &:hover,
                 &.is-active {
                     background: @at-color-side-nav-item-background-hover;
@@ -273,10 +277,11 @@
 
 .at-SettingsSubPane-content a {
     color: @at-white;
-    font-size: 0.85em;
+    font-size: 13px;
     padding: 10px 20px;
     text-decoration: none;
     display: block;
+    height: 39px;
 }
 
 // hover stuff
diff --git a/awx/ui/client/lib/components/layout/layout.partial.html b/awx/ui/client/lib/components/layout/layout.partial.html
index f66a24561d..d282ade9f1 100644
--- a/awx/ui/client/lib/components/layout/layout.partial.html
+++ b/awx/ui/client/lib/components/layout/layout.partial.html
@@ -96,7 +96,7 @@
             ng-show="$parent.layoutVm.isSuperUser || $parent.layoutVm.isOrgAdmin">
         </at-side-nav-item>
         <at-side-nav-item icon-class="fa-cog" route="settings" name="SETTINGS"
-            system-admin-only="true" show-settings-sub-menu="true">
+            system-admin-only="true" show-settings-sub-menu="true" no-tooltip-on-collapsed="true">
         </at-side-nav-item>
     </at-side-nav>
     <div class="at-Layout-main" ng-class="{'at-Layout-main--noLicense': vm.licenseIsMissing}">
diff --git a/awx/ui/client/lib/components/layout/side-nav-item.directive.js b/awx/ui/client/lib/components/layout/side-nav-item.directive.js
index 1189f513d8..a4af383182 100644
--- a/awx/ui/client/lib/components/layout/side-nav-item.directive.js
+++ b/awx/ui/client/lib/components/layout/side-nav-item.directive.js
@@ -61,7 +61,8 @@ function atSideNavItem () {
             iconClass: '@',
             name: '@',
             route: '@',
-            systemAdminOnly: '@'
+            systemAdminOnly: '@',
+            noTooltipOnCollapsed: '@'
         }
     };
 }
diff --git a/awx/ui/client/lib/components/layout/side-nav-item.partial.html b/awx/ui/client/lib/components/layout/side-nav-item.partial.html
index ca8ff13812..380ed08f10 100644
--- a/awx/ui/client/lib/components/layout/side-nav-item.partial.html
+++ b/awx/ui/client/lib/components/layout/side-nav-item.partial.html
@@ -1,9 +1,10 @@
 <a class="at-Layout-sideNavItem" ui-sref="{{ route }}" ng-class="{'is-active': vm.isRoute}"
     ng-show="(!systemAdminOnly || layoutVm.isSuperUser) && layoutVm.isLoggedIn &&
         !layoutVm.licenseIsMissing">
-        <at-popover state="vm.tooltip" ng-if="!navVm.isExpanded"></at-popover>
+        <at-popover ng-if="!noTooltipOnCollapsed && !navVm.isExpanded" state="vm.tooltip"></at-popover>
 
-        <i class="fa {{ iconClass }}" ng-show="navVm.isExpanded"></i>
+        <i class="fa {{ iconClass }}" ng-class="{'is-no-tooltip': noTooltipOnCollapsed}"
+            ng-show="noTooltipOnCollapsed || navVm.isExpanded"></i>
         <span class="at-Layout-sideNavItemName" ng-show="navVm.isExpanded">
             {{ layoutVm.getString(name) }}
         </span>
diff --git a/awx/ui/client/lib/theme/_variables.less b/awx/ui/client/lib/theme/_variables.less
index 284929253e..baab97f85b 100644
--- a/awx/ui/client/lib/theme/_variables.less
+++ b/awx/ui/client/lib/theme/_variables.less
@@ -238,6 +238,7 @@
 @at-padding-left-side-nav-toggle-icon: 15px;
 @at-padding-left-side-nav-item-icon: 10px;
 @at-padding-left-side-nav-item-icon-expanded: 15px;
+@at-padding-left-side-nav-item-icon-no-tooltip: 18px;
 @at-padding-between-side-nav-icon-text: @at-space-3x;
 @at-padding-list-empty: @at-space-2x;
 @at-padding-list-row-item-tag: 3px 9px;