diff --git a/awx/ui/client/legacy-styles/angular-scheduler.less b/awx/ui/client/legacy-styles/angular-scheduler.less
index 4f6817e08d..1216aa2eb1 100644
--- a/awx/ui/client/legacy-styles/angular-scheduler.less
+++ b/awx/ui/client/legacy-styles/angular-scheduler.less
@@ -139,17 +139,6 @@
         font-weight: normal;
         text-align: center;
     }
-    .ui-spinner.ui-widget-content {
-        border-bottom-color: #ccc;
-        border-top-color: #ccc;
-        border-left-color: #ccc;
-        border-right-color: #ccc;
-    }
-    .ui-spinner-button {
-        border-left-color: #ccc;
-        border-left-style: solid;
-        border-left-width: 1px;
-    }
     .scheduler-time-spinner {
         width: 40px;
         height: 24px;
diff --git a/awx/ui/client/legacy-styles/ansible-ui.less b/awx/ui/client/legacy-styles/ansible-ui.less
index 483e1ecf9d..8375321a46 100644
--- a/awx/ui/client/legacy-styles/ansible-ui.less
+++ b/awx/ui/client/legacy-styles/ansible-ui.less
@@ -139,7 +139,7 @@ a:focus {
 
 /* Make buttons appear to be disabled, but allow mouse events */
 .btn-disabled {
-   opacity: 1 !important;
+   opacity: 1;
    -webkit-box-shadow: none;
    box-shadow: none;
 }
@@ -2149,9 +2149,9 @@ tr td button i {
 
 /* Overwrite select2 base styles for single/multiple selects so that match up with other form elements.  Also overwrite disabled styles. */
 .select2-container--disabled,.select2-container--disabled  .select2-selection--single,.select2-container--disabled .select2-selection--multiple {
-    cursor: not-allowed !important;
-    opacity: 100 !important;
-    background: @egrey !important;
+    cursor: not-allowed;
+    opacity: 100;
+    background: @egrey;
 }
 
 .select2-container--default .select2-selection--single {
@@ -2309,13 +2309,13 @@ html input[disabled] {
 
 .btn-default {
   background: @default-bg;
-  border-color: @b7grey !important;
+  border-color: @b7grey;
   color: @default-interface-txt;
 }
 
 .select2-container--disabled .select2-selection,
 .select2-container--disabled .select2-arrow {
-    background: @egrey !important;
+    background: @egrey;
 }
 
 .btn.disabled,.btn[disabled],fieldset[disabled] .bt {
@@ -2324,9 +2324,9 @@ html input[disabled] {
 
 .ui-state-disabled,.ui-widget-content .ui-state-disabled,.ui-widget-header .ui-state-disabled {
     opacity: 1;
-    background: @egrey !important;
+    background: @egrey;
 }
 
 input[disabled].ui-spinner-input {
-  background-color: @egrey !important;
+  background-color: @egrey;
 }
diff --git a/awx/ui/client/legacy-styles/codemirror.less b/awx/ui/client/legacy-styles/codemirror.less
index 8ef6586f6a..6c402ada5b 100644
--- a/awx/ui/client/legacy-styles/codemirror.less
+++ b/awx/ui/client/legacy-styles/codemirror.less
@@ -11,11 +11,12 @@
     height: auto;
     overflow-x: scroll;
     overflow-y: hidden;
-    border: 1px solid @cgrey;
+    border: 1px solid @b7grey;
 }
 
+.CodeMirror,
 .CodeMirror-activeline-background {
-    background-color: @f7grey;
+    background-color: @default-secondary-bg;
 }
 
 /* Make sure code editor dialog is always at top of stack */
@@ -27,15 +28,44 @@
     z-index: 2060;
 }
 
-.CodeMirror {
-    border-color: @b7grey !important;
-}
-
 .CodeMirror-gutters {
-    border-color: @d7grey !important;
-    background-color: @default-secondary-bg !important;
+    border-color: @d7grey;
+    background-color: @default-no-items-bord;
 }
 
 .CodeMirror-lineNumber {
-    color: @default-icon !important;
+    color: @default-icon;
+}
+
+// Disabled
+textarea[disabled="disabled"] + div[id*="-container"]{
+    pointer-events: none;
+    cursor: not-allowed;
+
+        .CodeMirror {
+            cursor: not-allowed;
+        }
+
+        .CodeMirror.cm-s-default,
+        .CodeMirror-line {
+            background-color: @egrey;
+        }
+
+        .CodeMirror-gutters {
+            border-color: @b7grey;
+        }
+
+        .CodeMirror-gutter.CodeMirror-lint-markers,
+        .CodeMirror-gutter.CodeMirror-linenumbers {
+            background-color: @default-bg;
+            color: @default-interface-txt;
+        }
+
+        .CodeMirror-lines {
+            cursor: default;
+        }
+
+        .CodeMirror-cursors {
+            display: none;
+        }
 }
diff --git a/awx/ui/client/legacy-styles/forms.less b/awx/ui/client/legacy-styles/forms.less
index 4b448d5285..a279e5aa2a 100644
--- a/awx/ui/client/legacy-styles/forms.less
+++ b/awx/ui/client/legacy-styles/forms.less
@@ -682,16 +682,3 @@ input[type='radio']:checked:before {
 .alert-info--noTextTransform {
     text-transform: none;
 }
-
-.CodeMirror {
-    border-color: @b7grey !important;
-}
-
-.CodeMirror-gutters {
-    border-color: @d7grey !important;
-    background: @default-secondary-bg !important;
-}
-
-.CodeMirror-lineNumber {
-    color: @default-icon !important;
-}
diff --git a/awx/ui/client/legacy-styles/jquery-ui-overrides.less b/awx/ui/client/legacy-styles/jquery-ui-overrides.less
index 4f79854c2f..811b34ca28 100644
--- a/awx/ui/client/legacy-styles/jquery-ui-overrides.less
+++ b/awx/ui/client/legacy-styles/jquery-ui-overrides.less
@@ -98,7 +98,7 @@ table.ui-datepicker-calendar {
 
     button.btn.btn-default {
       text-transform: uppercase;
-      border-color: @d7grey;
+      border-color: @b7grey;
       color: @default-interface-txt;
     }
 
@@ -153,7 +153,7 @@ table.ui-datepicker-calendar {
 
 .ui-widget-content {
     background-image: none;
-    background-color: @white;
+    background-color: @default-secondary-bg;
 
     a,
     a:visited,
@@ -216,3 +216,16 @@ table.ui-datepicker-calendar {
 .ui-accordion .ui-accordion-header {
     margin-top: 1px;
 }
+
+.ui-spinner.ui-state-disabled,
+.ui-state-disabled .ui-spinner-button {
+    cursor: not-allowed !important;
+}
+
+.ui-state-disabled .ui-spinner-button:hover {
+    background-color: @default-bg !important;
+}
+
+.ui-state-disabled.ui-widget-content {
+    background-color: @egrey;
+}
diff --git a/awx/ui/client/src/configuration/configuration.block.less b/awx/ui/client/src/configuration/configuration.block.less
index a026253384..6ebe31e1af 100644
--- a/awx/ui/client/src/configuration/configuration.block.less
+++ b/awx/ui/client/src/configuration/configuration.block.less
@@ -108,35 +108,6 @@ input#filePickerText {
     color: @white;
 }
 
-//Codemirror and more disabling - you can still tab into the field with this method though
-textarea[disabled="disabled"] + div[id*="-container"]{
-    pointer-events: none;
-    cursor: not-allowed;
-
-        .CodeMirror {
-            cursor: not-allowed;
-        }
-
-        .CodeMirror.cm-s-default,
-        .CodeMirror-line {
-            background-color: #f6f6f6;
-        }
-
-        .CodeMirror-gutter.CodeMirror-lint-markers,
-        .CodeMirror-gutter.CodeMirror-linenumbers {
-            background-color: #ebebeb;
-            color: @b7grey;
-        }
-
-        .CodeMirror-lines {
-            cursor: default;
-        }
-
-        .CodeMirror-cursors {
-            display: none;
-        }
-}
-
 //Needed to show the not-allowed cursor over a Codemirror instance
 .Form-formGroup--disabled {
     cursor: not-allowed;
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 109cf41727..bd17e39aa8 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
@@ -87,7 +87,7 @@
     font-size: 10px;
     text-transform: uppercase;
     white-space: nowrap;
-    padding-right: 10px;
+    padding-right: 5px;
     padding-left: 10px;
     height: 20px;
     border: 1px solid @b7grey;
diff --git a/awx/ui/client/src/templates/job-template.form.js b/awx/ui/client/src/templates/job-template.form.js
index 3a3d006c10..732bc5767e 100644
--- a/awx/ui/client/src/templates/job-template.form.js
+++ b/awx/ui/client/src/templates/job-template.form.js
@@ -64,7 +64,8 @@ function(NotificationsList, CompletedJobsList, i18n) {
                     subCheckbox: {
                         variable: 'ask_job_type_on_launch',
                         ngShow: "!job_type.value || job_type.value !== 'scan'",
-                        text: i18n._('Prompt on launch')
+                        text: i18n._('Prompt on launch'),
+                        ngDisabled: '!(job_template_obj.summary_fields.user_capabilities.edit || canAddJobTemplate)'
                     },
                     ngDisabled: '!(job_template_obj.summary_fields.user_capabilities.edit || canAddJobTemplate)'
                 },
diff --git a/awx/ui/client/src/templates/workflows/workflow-chart/workflow-chart.block.less b/awx/ui/client/src/templates/workflows/workflow-chart/workflow-chart.block.less
index 12310a4f9e..c91eb2cd87 100644
--- a/awx/ui/client/src/templates/workflows/workflow-chart/workflow-chart.block.less
+++ b/awx/ui/client/src/templates/workflows/workflow-chart/workflow-chart.block.less
@@ -67,10 +67,13 @@
 }
 
 .WorkflowChart-svg {
+    border-bottom-left-radius: 5px;
+}
+
+.WorkflowResults-rightSide .WorkflowChart-svg {
     background-color: @default-secondary-bg;
     border: 1px solid @d7grey;
     border-top: 0px;
-    border-bottom-left-radius: 5px;
     border-bottom-right-radius: 5px;
 }
 .WorkflowChart-nodeTypeCircle {