diff --git a/awx/static/favicon.ico b/awx/static/favicon.ico
index 31b759caf9..5c6280873a 100644
Binary files a/awx/static/favicon.ico and b/awx/static/favicon.ico differ
diff --git a/awx/ui/client/assets/favicon.ico b/awx/ui/client/assets/favicon.ico
index f53629b961..41132fb823 100644
Binary files a/awx/ui/client/assets/favicon.ico and b/awx/ui/client/assets/favicon.ico differ
diff --git a/awx/ui/client/legacy-styles/ansible-ui.less b/awx/ui/client/legacy-styles/ansible-ui.less
index 287e92b690..d9a319a298 100644
--- a/awx/ui/client/legacy-styles/ansible-ui.less
+++ b/awx/ui/client/legacy-styles/ansible-ui.less
@@ -1891,6 +1891,7 @@ tr td button i {
 
 .nvtooltip {
     border-radius: 4px;
+    padding: 10px;
 }
 
 .nvtooltip td.value {
diff --git a/awx/ui/client/legacy-styles/jquery-ui-overrides.less b/awx/ui/client/legacy-styles/jquery-ui-overrides.less
index f9748fc807..826b77e711 100644
--- a/awx/ui/client/legacy-styles/jquery-ui-overrides.less
+++ b/awx/ui/client/legacy-styles/jquery-ui-overrides.less
@@ -8,6 +8,7 @@
  *
  */
 
+@import "awx/ui/client/src/shared/branding/colors.default.less";
 
 table.ui-datepicker-calendar {
     background-color: @well;
@@ -174,6 +175,7 @@ table.ui-datepicker-calendar {
 
     .dropdown-menu>li>a {
         color: @black;
+        color: @default-interface-txt
     }
 
     .pagination .active {
diff --git a/awx/ui/client/src/dashboard/counts/dashboard-counts.block.less b/awx/ui/client/src/dashboard/counts/dashboard-counts.block.less
index a29476fd90..cd563cfff3 100644
--- a/awx/ui/client/src/dashboard/counts/dashboard-counts.block.less
+++ b/awx/ui/client/src/dashboard/counts/dashboard-counts.block.less
@@ -42,6 +42,52 @@
     }
 }
 
+@media only screen and (max-width: 360px) {
+    .DashboardCounts-label {
+        font-size: 10px;
+    }
+
+    .DashboardList-headerText {
+        white-space: normal;
+        line-height: 22px;
+        padding-top: 10px;
+    }
+
+    .DashboardList-timeCell {
+        white-space: normal;
+    }
+}
+
+.DashboardGraphs-filteringDropdowns {
+    display: inherit;
+}
+
+@media only screen and (max-width: 540px) {
+    .DashboardGraphs-filteringDropdowns {
+        float: left;
+        width: 100%;
+    }
+
+    .DashboardGraphs-filterLabel {
+        width: 50%;
+        float:left;
+    }
+
+    .DashboardGraphs-periodDropdown {
+        width: 50%;
+        float: left;
+    }
+
+    .DashboardList-container {
+        th {
+            width: 25%;
+            white-space: nowrap;
+        }
+    }
+}
+
+
+
 .DashboardCounts-buttonStyle:hover {
     background-color: @db-count-succ;
     border-color: @db-count-succ;
diff --git a/awx/ui/client/src/dashboard/dashboard.block.less b/awx/ui/client/src/dashboard/dashboard.block.less
index 75d9525040..286ee0c406 100644
--- a/awx/ui/client/src/dashboard/dashboard.block.less
+++ b/awx/ui/client/src/dashboard/dashboard.block.less
@@ -18,6 +18,24 @@
     width: 100%;
 }
 
+.DashboardGraphs-filterDropdownItems {
+    li > a {
+        color: @default-interface-txt;
+    }
+}
+
+#status-dropdown + ul.dropdown-menu {
+    margin-left: -96px;
+}
+
+#type-dropdown + ul.dropdown-menu {
+    margin-left: -95px;
+}
+
+#period-dropdown + ul.dropdown-menu {
+    margin-left: -40px;
+}
+
 .Dashboard-list {
     border: 1px solid @default-border;
     border-radius: 5px;
diff --git a/awx/ui/client/src/dashboard/graphs/dashboard-graphs.partial.html b/awx/ui/client/src/dashboard/graphs/dashboard-graphs.partial.html
index 663a53b8ff..62e8ffe02d 100644
--- a/awx/ui/client/src/dashboard/graphs/dashboard-graphs.partial.html
+++ b/awx/ui/client/src/dashboard/graphs/dashboard-graphs.partial.html
@@ -4,74 +4,80 @@
             JOB STATUS
         </h3>
         <div class="DashboardGraphs-graphToolbar" ng-show="!hostStatusSelected">
-            <div class="DashboardGraphs-filterLabel">Period</div>
-            <div class="DashboardGraphs-periodDropdown">
-                <a id="period-dropdown" role="button"
-                data-toggle="dropdown"
-                data-target="#"
-                href="/page.html"
-                class="DashboardGraphs-filterDropdownText">
-                    Past Month <i class="fa fa-chevron-down DashboardGraphs-filterIcon"></i>
-                </a>
-                <ul class="dropdown-menu DashboardGraphs-filterDropdownItems
-                    DashboardGraphs-filterDropdownItems--period" role="menu" aria-labelledby="period-dropdown">
-                    <li>
-                        <a class="n" id="day" >Past 24 Hours </a>
-                    </li>
-                    <li>
-                        <a class="n" id="week">Past Week</a>
-                    </li>
-                    <li>
-                        <a class="n" id="month">Past Month</a>
-                    </li>
-                </ul>
+            <div class="DashboardGraphs-filteringDropdowns">
+                <div class="DashboardGraphs-filterLabel">Period</div>
+                <div class="DashboardGraphs-periodDropdown">
+                    <a id="period-dropdown" role="button"
+                    data-toggle="dropdown"
+                    data-target="#"
+                    href="/page.html"
+                    class="DashboardGraphs-filterDropdownText">
+                        Past Month <i class="fa fa-chevron-down DashboardGraphs-filterIcon"></i>
+                    </a>
+                    <ul class="dropdown-menu DashboardGraphs-filterDropdownItems
+                        DashboardGraphs-filterDropdownItems--period" role="menu" aria-labelledby="period-dropdown">
+                        <li>
+                            <a class="n" id="day" >Past 24 Hours </a>
+                        </li>
+                        <li>
+                            <a class="n" id="week">Past Week</a>
+                        </li>
+                        <li>
+                            <a class="n" id="month">Past Month</a>
+                        </li>
+                    </ul>
+                </div>
             </div>
-            <div class="DashboardGraphs-filterLabel">Job Type</div>
-            <div class="DashboardGraphs-jobTypeDropdown">
+            <div class="DashboardGraphs-filteringDropdowns">
+                <div class="DashboardGraphs-filterLabel">Job Type</div>
+                <div class="DashboardGraphs-jobTypeDropdown">
 
-                    <a id="type-dropdown" role="button" data-toggle="dropdown" data-target="#" class="DashboardGraphs-filterDropdownText"
-                    href="/page.html">
+                        <a id="type-dropdown" role="button" data-toggle="dropdown" data-target="#" class="DashboardGraphs-filterDropdownText"
+                        href="/page.html">
+                            All <i class="fa fa-chevron-down DashboardGraphs-filterIcon"></i>
+                        </a>
+
+                    <ul class="dropdown-menu DashboardGraphs-filterDropdownItems
+                        DashboardGraphs-filterDropdownItems--jobType" role="menu" aria-labelledby="type-dropdown">
+                        <li>
+                            <a class="m" id="all">All</a>
+                        </li>
+                        <li>
+                            <a class="m" id="inv_sync">Inventory Sync</a>
+                        </li>
+                        <li>
+                            <a class="m" id="scm_update">SCM Update</a>
+                        </li>
+                        <li>
+                            <a class="m" id="playbook_run">Playbook Run</a>
+                        </li>
+                    </ul>
+                </div>
+            </div>
+            <div class="DashboardGraphs-filteringDropdowns">
+                <div class="DashboardGraphs-filterLabel">View</div>
+                <div class="DashboardGraphs-periodDropdown">
+                    <a id="status-dropdown" role="button"
+                    data-toggle="dropdown"
+                    data-target="#"
+                    href="/page.html"
+                    class="DashboardGraphs-filterDropdownText">
                         All <i class="fa fa-chevron-down DashboardGraphs-filterIcon"></i>
                     </a>
 
-                <ul class="dropdown-menu DashboardGraphs-filterDropdownItems
-                    DashboardGraphs-filterDropdownItems--jobType" role="menu" aria-labelledby="type-dropdown">
-                    <li>
-                        <a class="m" id="all">All</a>
-                    </li>
-                    <li>
-                        <a class="m" id="inv_sync">Inventory Sync</a>
-                    </li>
-                    <li>
-                        <a class="m" id="scm_update">SCM Update</a>
-                    </li>
-                    <li>
-                        <a class="m" id="playbook_run">Playbook Run</a>
-                    </li>
-                </ul>
-            </div>
-            <div class="DashboardGraphs-filterLabel">View</div>
-            <div class="DashboardGraphs-periodDropdown">
-                <a id="status-dropdown" role="button"
-                data-toggle="dropdown"
-                data-target="#"
-                href="/page.html"
-                class="DashboardGraphs-filterDropdownText">
-                    All <i class="fa fa-chevron-down DashboardGraphs-filterIcon"></i>
-                </a>
-
-                <ul class="dropdown-menu DashboardGraphs-filterDropdownItems
-                    DashboardGraphs-filterDropdownItems--period" role="menu" aria-labelledby="status-dropdown">
-                    <li>
-                        <a class="o" id="both" >All</a>
-                    </li>
-                    <li>
-                        <a class="o" id="failed">Successful</a>
-                    </li>
-                    <li>
-                        <a class="o" id="successful">Failed</a>
-                    </li>
-                </ul>
+                    <ul class="dropdown-menu DashboardGraphs-filterDropdownItems
+                        DashboardGraphs-filterDropdownItems--period" role="menu" aria-labelledby="status-dropdown">
+                        <li>
+                            <a class="o" id="both" >All</a>
+                        </li>
+                        <li>
+                            <a class="o" id="failed">Successful</a>
+                        </li>
+                        <li>
+                            <a class="o" id="successful">Failed</a>
+                        </li>
+                    </ul>
+                </div>
             </div>
         </div>
     </div>
diff --git a/awx/ui/client/src/dashboard/lists/dashboard-list.block.less b/awx/ui/client/src/dashboard/lists/dashboard-list.block.less
index 4c25e4d4ad..bad3b06e96 100644
--- a/awx/ui/client/src/dashboard/lists/dashboard-list.block.less
+++ b/awx/ui/client/src/dashboard/lists/dashboard-list.block.less
@@ -35,7 +35,7 @@
     color: @btn-txt;
     background-color: @btn-bg;
     font-size: 12px;
-    border: 1px solid @btn-bord;
+    border: 1px solid @default-icon-hov;
     border-radius: 5px;
     margin-right: 15px;
     margin-top: 10px;
diff --git a/awx/ui/client/src/dashboard/lists/job-templates/job-templates-list.partial.html b/awx/ui/client/src/dashboard/lists/job-templates/job-templates-list.partial.html
index 103de983c9..da60bce8cf 100644
--- a/awx/ui/client/src/dashboard/lists/job-templates/job-templates-list.partial.html
+++ b/awx/ui/client/src/dashboard/lists/job-templates/job-templates-list.partial.html
@@ -10,10 +10,8 @@
     <div class="DashboardList-container">
         <table class="List-table">
            <tr class="List-tableHeaderRow">
-                <th class="List-tableHeader DashboardList-tableHeader--name"
-                    ng-click="sort('job_templates','name')">
+                <th class="List-tableHeader DashboardList-tableHeader--name">
                         Title
-                    <i class="DashboardList-tableHeaderIcon fa fa-sort-up"></i>
                 </th>
                 <th class="List-tableHeader DashboardList-tableHeader--activity">
                   Activity
@@ -53,7 +51,7 @@
         </h3>
     </div>
     <div class="DashboardList-container">
-        <p class="DashboardList-noJobs">It doesn't seem like you have used any currently available job templates.<br />
+        <p class="DashboardList-noJobs">No job templates were recently used.<br />
         You can create a job template <a href="#/job_templates/add">here</a>.</p>
     </div>
 </div>
diff --git a/awx/ui/client/src/dashboard/lists/jobs/jobs-list.partial.html b/awx/ui/client/src/dashboard/lists/jobs/jobs-list.partial.html
index 86235f700f..a728d64d2e 100644
--- a/awx/ui/client/src/dashboard/lists/jobs/jobs-list.partial.html
+++ b/awx/ui/client/src/dashboard/lists/jobs/jobs-list.partial.html
@@ -10,7 +10,7 @@
     <div class="DashboardList-container">
         <table class="List-table">
            <tr>
-              <th class="List-tableHeader DashboardList-tableHeader--name" ng-click="sort('job_templates','name')">Title <i class="DashboardList-tableHeaderIcon fa fa-sort-up"></i></th>
+              <th class="List-tableHeader DashboardList-tableHeader--name">Title</th>
               <th class="List-tableHeader DashboardList-tableHeader--time">Time</th>
            </tr>
            <tr class="List-tableRow"
@@ -38,10 +38,10 @@
 <div class="DashboardList" ng-show="noJobs">
     <div class="DashboardList-header">
         <h3 class="DashboardList-headerText">
-            RECENT JOB RUNS
+            RECENTLY RUN JOBS
         </h3>
     </div>
     <div class="DashboardList-container">
-        <p class="DashboardList-noJobs">It doesn't seem like you have any recent job runs.</p>
+        <p class="DashboardList-noJobs">No jobs were recently run.</p>
     </div>
 </div>
diff --git a/awx/ui/client/src/smart-status/smart-status.block.less b/awx/ui/client/src/smart-status/smart-status.block.less
index fdb80aaa65..92b5244e4f 100644
--- a/awx/ui/client/src/smart-status/smart-status.block.less
+++ b/awx/ui/client/src/smart-status/smart-status.block.less
@@ -35,6 +35,7 @@
     text-align: left;
     max-width: 250px;
     padding: 10px;
+    line-height: 22px;
 }
 
 .SmartStatus-tooltip--success{