diff --git a/awx/ui/client/src/home/dashboard/graphs/dashboard-graphs.block.less b/awx/ui/client/src/home/dashboard/graphs/dashboard-graphs.block.less
index 3f18d18ae9..fb9c513852 100644
--- a/awx/ui/client/src/home/dashboard/graphs/dashboard-graphs.block.less
+++ b/awx/ui/client/src/home/dashboard/graphs/dashboard-graphs.block.less
@@ -57,6 +57,15 @@
     padding-right: 10px;
     padding-left: 10px;
     text-transform: uppercase;
+    display: inline-block;
+    vertical-align: middle;
+    height: 20px;
+
+    & > span {
+        display: inline-block;
+        vertical-align: middle;
+        line-height: 20px;
+    }
 }
 
 .DashboardGraphs-graph {
@@ -76,21 +85,23 @@
 .DashboardGraphs-filterDropdownText:hover,
 .DashboardGraphs-filterDropdownText:focus,
 .DashboardGraphs-filterDropdownText:active {
-    color: @db-graph-per-dd-txt;
+    color: @default-data-txt;
 }
 
 .DashboardGraphs-filterDropdownText {
-    flex: initial;
     background-color: @db-graph-per-dd-bg;
     font-size: 10px;
     text-transform: uppercase;
     white-space: nowrap;
     padding-right: 5px;
-    padding-left: 10px;
+    padding-left: 5px;
     height: 20px;
     border: 1px solid @b7grey;
     border-radius: 5px;
     transition: background-color 0.2s;
+    display: inline-block;
+    vertical-align: middle;
+    width: 100%;
 }
 
 .DashboardGraphs-filterDropdownText:hover {
@@ -101,8 +112,9 @@
     color: @db-graph-per-dd-icon;
     font-size: 12px;
     width: 20px;
-    padding-left:10px;
+    padding-left: 10px;
     padding-right: 10px;
+    float: right;
 }
 
 .DashboardGraphs-filterDropdownItems {
@@ -113,6 +125,11 @@
     text-transform: uppercase;
     cursor: pointer;
     border-color: @d7grey;
+    min-width: 115px;
+
+    a > span {
+        float: none;
+    }
 }
 
 .DashboardGraphs-filterDropdownItems {
@@ -125,11 +142,25 @@
 .DashboardGraphs-jobTypeDropdown,
 .DashboardGraphs-statusDropdown {
     font-size: 10px;
-    padding-top:0px;
-}
+    display: inline-block;
+    padding-top: 0px;
+    min-width: 115px;
+    width: inherit;
 
-.DashboardGraphs-filterDropdownItems {
-    min-width: 0;
+    span {
+        height: 18px;
+        display: inline-block;
+        vertical-align: middle;
+        line-height: 18px;
+        float: left;
+    }
+
+    i {
+        height: 18px;
+        line-height: 18px;
+        display: inline-block;
+        vertical-align: middle;
+    }
 }
 
 .DashboardGraphs-statusFilters{
@@ -169,10 +200,12 @@
 
 .DashboardGraphs-filteringDropdowns {
     display: inherit;
+    margin-left: 10px;
 }
 
 .DashboardGraphs-filterDropdownItems {
     li > a {
+        text-align: left;
         color: @default-interface-txt;
     }
 }
@@ -183,18 +216,28 @@
         margin-right: 0px;
     }
 
+    .DashboardGraphs-filterDropdownItems {
+        left: 50%;
+        right: 35px;
+    }
+
     .DashboardGraphs-filteringDropdowns {
         float: left;
         width: 100%;
-        margin-left: -10px;
+        margin-left: 0;
     }
 
     .DashboardGraphs-filterLabel {
+        margin-top: 10px;
         width: 50%;
-        float:left;
+        float: left;
+        padding-left: 0;
     }
 
-    .DashboardGraphs-periodDropdown {
+    .DashboardGraphs-periodDropdown,
+    .DashboardGraphs-jobTypeDropdown,
+    .DashboardGraphs-statusDropdown {
+        margin-top: 10px;
         width: 50%;
         float: left;
     }
diff --git a/awx/ui/client/src/home/dashboard/graphs/job-status/job-status-graph.directive.js b/awx/ui/client/src/home/dashboard/graphs/job-status/job-status-graph.directive.js
index 1d8b1c980c..23a4489b4b 100644
--- a/awx/ui/client/src/home/dashboard/graphs/job-status/job-status-graph.directive.js
+++ b/awx/ui/client/src/home/dashboard/graphs/job-status/job-status-graph.directive.js
@@ -122,9 +122,15 @@ function JobStatusGraph($window, adjustGraphSize, templateUrl, i18n, graphDataSe
                     // when the Period drop down filter is used, create a new graph based on the
                     $('.n').on("click", function(){
                         period = this.getAttribute("id");
+
                         $('#period-dropdown')
-                            .replaceWith("<a id=\"period-dropdown\" class=\"DashboardGraphs-filterDropdownText DashboardGraphs-filterDropdownItems--period\" role=\"button\" data-toggle=\"dropdown\" data-target=\"#\" href=\"/page.html\">"+this.text+
-                        "<i class=\"fa fa-angle-down DashboardGraphs-filterIcon\"></i>\n");
+                            .replaceWith(`
+                                <a id="period-dropdown" class="DashboardGraphs-filterDropdownText DashboardGraphs-filterDropdownItems--period" role="button"
+                                   data-toggle="dropdown" data-target="#" href="/page.html">
+                                    <span>${this.text}</span>
+                                    <i class="fa fa-angle-down DashboardGraphs-filterIcon"></i>
+                                </a>`);
+
                         scope.$parent.isFailed = true;
                         scope.$parent.isSuccessful = true;
                         recreateGraph(period, job_type);
@@ -133,8 +139,15 @@ function JobStatusGraph($window, adjustGraphSize, templateUrl, i18n, graphDataSe
                     //On click, update with new data
                     $('.m').on("click", function(){
                         job_type = this.getAttribute("id");
-                        $('#type-dropdown').replaceWith("<a id=\"type-dropdown\" class=\"DashboardGraphs-filterDropdownText DashboardGraphs-filterDropdownItems--jobType\" role=\"button\" data-toggle=\"dropdown\" data-target=\"#\" href=\"/page.html\">"+this.text+
-                        "<i class=\"fa fa-angle-down DashboardGraphs-filterIcon\"></i>\n");
+
+                        $('#type-dropdown')
+                            .replaceWith(`
+                                <a id="type-dropdown" class="DashboardGraphs-filterDropdownText DashboardGraphs-filterDropdownItems--jobType" role="button"
+                                   data-toggle="dropdown" data-target="#" href="/page.html">
+                                    <span>${this.text}</span>
+                                    <i class="fa fa-angle-down DashboardGraphs-filterIcon"></i>
+                                </a>`);
+
                         scope.$parent.isFailed = true;
                         scope.$parent.isSuccessful = true;
                         recreateGraph(period, job_type);
@@ -142,8 +155,15 @@ function JobStatusGraph($window, adjustGraphSize, templateUrl, i18n, graphDataSe
 
                     $('.o').on('click', function() {
                         var job_status = this.getAttribute('id');
-                        $('#status-dropdown').replaceWith("<a id=\"status-dropdown\" class=\"DashboardGraphs-filterDropdownText DashboardGraphs-filterDropdownText--status\" role=\"button\" data-toggle=\"dropdown\" data-target=\"#\" href=\"/page.html\">"+this.text+
-                        "<i class=\"fa fa-angle-down DashboardGraphs-filterIcon\"></i>\n");
+
+                        $('#status-dropdown')
+                            .replaceWith(`
+                                <a id="status-dropdown" class="DashboardGraphs-filterDropdownText DashboardGraphs-filterDropdownItems--status" role="button"
+                                   data-toggle="dropdown" data-target="#" href="/page.html">
+                                    <span>${this.text}</span>
+                                    <i class="fa fa-angle-down DashboardGraphs-filterIcon"></i>
+                                </a>`);
+
                         scope.$broadcast("jobStatusChange", job_status);
                     });
 
diff --git a/awx/ui/client/src/home/dashboard/lists/dashboard-list.block.less b/awx/ui/client/src/home/dashboard/lists/dashboard-list.block.less
index c6b11557f3..749878527f 100644
--- a/awx/ui/client/src/home/dashboard/lists/dashboard-list.block.less
+++ b/awx/ui/client/src/home/dashboard/lists/dashboard-list.block.less
@@ -143,6 +143,7 @@
 
 .DashboardList-noJobs {
     color: @list-empty-txt;
+    margin-top: 20px;
 }
 
 @media only screen and (max-width: 360px) {