diff --git a/awx/ui/static/less/jquery-ui-overrides.less b/awx/ui/static/less/jquery-ui-overrides.less
index 42beca288f..db946bcac7 100644
--- a/awx/ui/static/less/jquery-ui-overrides.less
+++ b/awx/ui/static/less/jquery-ui-overrides.less
@@ -90,6 +90,9 @@ table.ui-datepicker-calendar {
 }
 
 .ui-widget-content {
+    background-image: none;
+    background-color: transparent;
+
     a,
     a:visited,
     a:active {
@@ -121,6 +124,17 @@ table.ui-datepicker-calendar {
     }
 }
 
+.ui-state-active,
+.ui-state-default {
+    background-image: none;
+    background-color: transparent;
+    border: 1px solid @well-border;
+}
+
+.ui-widget-content {
+    border: 1px solid @well-border;
+}
+
 .ui-spinner a.ui-spinner-button {
     border-left: 1px solid #A6C9E2;
 }
diff --git a/awx/ui/static/lib/ansible/form-generator.js b/awx/ui/static/lib/ansible/form-generator.js
index 4740e16896..24abd14aae 100644
--- a/awx/ui/static/lib/ansible/form-generator.js
+++ b/awx/ui/static/lib/ansible/form-generator.js
@@ -1132,7 +1132,7 @@ angular.module('FormGenerator', ['GeneratorHelpers', 'Utilities', 'ListGenerator
                 // Start the well
                 if (!this.modal && this.form.well) {
                     if ( !(this.form.collapse && this.form.collapseMode === options.mode)) {
-                        html += "<div class=\"well\">\n";
+                        html += "<div class=\"aw-form-well\">\n";
                     }
                 }