diff --git a/awx/ui/static/js/main-menu/default-menu.directive.js b/awx/ui/static/js/main-menu/default-menu.directive.js
index 4e279e515a..792009307e 100644
--- a/awx/ui/static/js/main-menu/default-menu.directive.js
+++ b/awx/ui/static/js/main-menu/default-menu.directive.js
@@ -8,6 +8,7 @@ export default function() {
 
             scope.$on('$destroy', function() {
                 contents.remove();
+                $(".MenuItem--socketStatus").remove();
             });
         }
     };
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 ee17312283..c38e36e1f0 100644
--- a/awx/ui/static/js/main-menu/menu-default.partial.html
+++ b/awx/ui/static/js/main-menu/menu-default.partial.html
@@ -10,7 +10,8 @@
 <a menu-item link-to="jobs" title="Jobs" class="MenuItem">
     Jobs
 </a>
-<a link-to="userEdit" model="{ user_id: currentUser }" class="MenuItem MenuItem--right MenuItem--fixed MenuItem-username">
+<web-socket-status class="MenuItem MenuItem--socketStatus MenuItem--right MenuItem--fixed"></web-socket-status>
+<a link-to="userEdit" model="{ user_id: currentUser }" class="MenuItem MenuItem--right MenuItem--fixed MenuItem--username">
   <i class="MenuItem-icon MenuItem-icon--labelled">
     <aw-icon name="User"></aw-icon>
   </i>
diff --git a/awx/ui/static/js/main-menu/menu-item.block.less b/awx/ui/static/js/main-menu/menu-item.block.less
index 8740f6e84f..587ad03899 100644
--- a/awx/ui/static/js/main-menu/menu-item.block.less
+++ b/awx/ui/static/js/main-menu/menu-item.block.less
@@ -118,13 +118,20 @@
       }
   }
 
-  &-username {
+  &--socketStatus {
+      @media screen and (max-width: @menu-breakpoint) {
+          display: none;
+      }
+  }
+
+  &--username {
       padding-right: 0.25rem;
       @media screen and (max-width: @menu-breakpoint) {
           order: 1; // moves this to the bottom
       }
       @media screen and (min-width: (@menu-breakpoint + 1px)) {
           max-width: 110px;
+          margin-left: -3px;
       }
   }
 
diff --git a/awx/ui/static/js/main-menu/menu-portal.partial.html b/awx/ui/static/js/main-menu/menu-portal.partial.html
index 0269647dfb..b34ba0ca28 100644
--- a/awx/ui/static/js/main-menu/menu-portal.partial.html
+++ b/awx/ui/static/js/main-menu/menu-portal.partial.html
@@ -1,7 +1,8 @@
 <a href="#portal" title="Portal" class="MenuItem MenuItem--hoverable">
     Portal
 </a>
-<a link-to="userEdit" model="{ user_id: currentUser }" class="MenuItem MenuItem--right MenuItem--fixed MenuItem-username">
+<web-socket-status class="MenuItem MenuItem--socketStatus MenuItem--right MenuItem--fixed"></web-socket-status>
+<a link-to="userEdit" model="{ user_id: currentUser }" class="MenuItem MenuItem--fixed MenuItem-username">
   <i class="MenuItem-icon MenuItem-icon--labelled">
     <aw-icon name="User"></aw-icon>
   </i>
diff --git a/awx/ui/static/js/main-menu/portal-menu.directive.js b/awx/ui/static/js/main-menu/portal-menu.directive.js
index 0b407b3e20..e7aeceb0e6 100644
--- a/awx/ui/static/js/main-menu/portal-menu.directive.js
+++ b/awx/ui/static/js/main-menu/portal-menu.directive.js
@@ -8,8 +8,8 @@ export default function() {
 
             scope.$on('$destroy', function() {
                 contents.remove();
+                $(".MenuItem--socketStatus").remove();
             });
         }
     };
 }
-
diff --git a/awx/ui/static/js/main-menu/web-socket-status.partial.html b/awx/ui/static/js/main-menu/web-socket-status.partial.html
index 3d3ee3f15d..7f9ba2543e 100644
--- a/awx/ui/static/js/main-menu/web-socket-status.partial.html
+++ b/awx/ui/static/js/main-menu/web-socket-status.partial.html
@@ -1,13 +1,10 @@
 <button
-    ng-click="socketHelp()"
-    aw-pop-over="{{socketTip}}"
-    aw-pop-over-watch="socketTip"
-    data-popover-title="Live Events"
-    data-placement="left"
+    aw-tool-tip="{{socketTip}}"
+    tip-watch="socketTip"
+    data-placement="bottom"
     data-trigger="hover"
     data-container="body"
     class="Button--pseudo"
     ng-if="socketStatus !== 'ok'">
     <i class="fa icon-socket-{{socketStatus}}"></i>
 </button>
-
diff --git a/awx/ui/static/js/shared/Socket.js b/awx/ui/static/js/shared/Socket.js
index 079eb488bc..b8be09d2dc 100644
--- a/awx/ui/static/js/shared/Socket.js
+++ b/awx/ui/static/js/shared/Socket.js
@@ -51,10 +51,10 @@ angular.module('SocketIO', ['AuthService', 'Utilities'])
                 var result = '';
                 switch(status) {
                     case 'error':
-                        result = "Live events: error connecting to the Tower server. Click for troubleshooting help.";
+                        result = "Live events: error connecting to the Tower server.";
                         break;
                     case 'connecting':
-                        result = "Live events: attempting to connect to the Tower server. Click for troubleshooting help.";
+                        result = "Live events: attempting to connect to the Tower server.";
                         break;
                     case "ok":
                         result = "Live events: connected. Pages containing job status information will automatically update in real-time.";
diff --git a/awx/ui/static/js/shared/directives.js b/awx/ui/static/js/shared/directives.js
index 9226ecfd16..e0627c8cb1 100644
--- a/awx/ui/static/js/shared/directives.js
+++ b/awx/ui/static/js/shared/directives.js
@@ -485,7 +485,8 @@ angular.module('AWDirectives', ['RestServices', 'Utilities', 'AuthService', 'Job
                     html: true,
                     title: attrs.awToolTip,
                     container: 'body',
-                    trigger: 'hover focus'
+                    trigger: 'hover focus',
+                    template: '<div class="Tooltip tooltip" role="tooltip"><div class="Tooltip-arrow tooltip-arrow"></div><div class="Tooltip-inner tooltip-inner"></div></div>'
                 });
 
                 if (attrs.tipWatch) {
diff --git a/awx/ui/static/js/tooltip/tooltip.block.less b/awx/ui/static/js/tooltip/tooltip.block.less
new file mode 100644
index 0000000000..e7965e954d
--- /dev/null
+++ b/awx/ui/static/js/tooltip/tooltip.block.less
@@ -0,0 +1,7 @@
+/** @define Tooltip */
+
+@import "shared/branding/colors.less";
+.Tooltip-inner {
+    white-space: pre-wrap;
+    word-break: break-word;
+}
diff --git a/awx/ui/templates/ui/index.html b/awx/ui/templates/ui/index.html
index 3fdd01e82b..2eb3d6223b 100644
--- a/awx/ui/templates/ui/index.html
+++ b/awx/ui/templates/ui/index.html
@@ -36,12 +36,6 @@
   </main-menu>
 
   <div class="container-fluid">
-    <div class="row">
-      <div class="col-lg-11"></div>
-      <div class="col-lg-1" style="display: flex;">
-        <web-socket-status style="margin-left: auto;"></web-socket-status>
-      </div>
-    </div>
     <div class="container-fluid" id="#content-container">
       <div class="row">
           <div class="col-lg-12">