diff --git a/awx/ui/client/legacy-styles/forms.less b/awx/ui/client/legacy-styles/forms.less
index cdd7690fdf..1cd8059d7c 100644
--- a/awx/ui/client/legacy-styles/forms.less
+++ b/awx/ui/client/legacy-styles/forms.less
@@ -80,6 +80,10 @@
     padding-right: 15px;
 }
 
+.Form-saveButton:disabled{
+    background-color: @submit-button-bg-dis;
+}
+
 .Form-saveButton:hover{
     background-color: @submit-button-bg-hov;
     color: @submit-button-text;
diff --git a/awx/ui/client/src/shared/branding/colors.default.less b/awx/ui/client/src/shared/branding/colors.default.less
index e9421c927b..34017ba341 100644
--- a/awx/ui/client/src/shared/branding/colors.default.less
+++ b/awx/ui/client/src/shared/branding/colors.default.less
@@ -82,6 +82,7 @@
 @submit-button-text:    @default-bg;
 @submit-button-bg:      @default-succ;
 @submit-button-bg-hov:  @default-succ-hov;
+@submit-button-bg-dis:  @default-second-border;
 
 // footer
 @copyright-text:        @default-interface-txt;
diff --git a/awx/ui/client/src/shared/form-generator.js b/awx/ui/client/src/shared/form-generator.js
index ca3037d7ce..359d86ccaf 100644
--- a/awx/ui/client/src/shared/form-generator.js
+++ b/awx/ui/client/src/shared/form-generator.js
@@ -1565,9 +1565,6 @@ angular.module('FormGenerator', [GeneratorHelpers.name, 'Utilities', listGenerat
                                     }
                                 }
                                 html += ">";
-                                html += SelectIcon({
-                                    action: btn
-                                });
                                 html += " " + button.label + "</button>\n";
                             }
                         }