diff --git a/awx/ui/static/js/controllers/Organizations.js b/awx/ui/static/js/controllers/Organizations.js
index 67dd5f908d..18e0c2942f 100644
--- a/awx/ui/static/js/controllers/Organizations.js
+++ b/awx/ui/static/js/controllers/Organizations.js
@@ -130,7 +130,7 @@ function OrganizationsAdd ($scope, $rootScope, $compile, $location, $log, $route
    // Cancel
    scope.formReset = function() {
       $rootScope.flashMessage = null;
-      form.reset();
+      generator.reset();
       }; 
 }
 
@@ -223,7 +223,7 @@ function OrganizationsEdit ($scope, $rootScope, $compile, $location, $log, $rout
    // Reset the form
    scope.formReset = function() {
       $rootScope.flashMessage = null;
-      form.reset();
+      generator.reset();
       for (var fld in master) {
           scope[fld] = master[fld];
       }
diff --git a/awx/ui/static/js/forms/Credentials.js b/awx/ui/static/js/forms/Credentials.js
index 322e05f9b3..1875dcd6f3 100644
--- a/awx/ui/static/js/forms/Credentials.js
+++ b/awx/ui/static/js/forms/Credentials.js
@@ -243,16 +243,11 @@ angular.module('CredentialFormDefinition', [])
         buttons: { //for now always generates <button> tags 
             save: { 
                 label: 'Save', 
-                icon: 'icon-ok',
-                "class": 'btn-success',
                 ngClick: 'formSave()',    //$scope.function to call on click, optional
                 ngDisabled: true          //Disable when $pristine or $invalid, optional
                 },
             reset: { 
                 ngClick: 'formReset()',
-                label: 'Reset',
-                icon: 'icon-undo',
-                'class': 'btn btn-default',
                 ngDisabled: true          //Disabled when $pristine
                 }
             },
diff --git a/awx/ui/static/js/forms/Groups.js b/awx/ui/static/js/forms/Groups.js
index 04bb9e525c..d503b56f6f 100644
--- a/awx/ui/static/js/forms/Groups.js
+++ b/awx/ui/static/js/forms/Groups.js
@@ -236,17 +236,11 @@ angular.module('GroupFormDefinition', [])
             controlClass: 'col-lg-5',
 
             save: { 
-                label: 'Save', 
-                icon: 'icon-ok',
-                "class": 'btn btn-success',
                 ngClick: 'formSave()',    //$scope.function to call on click, optional
                 ngDisabled: true          //Disable when $pristine or $invalid, optional
                 },
             reset: { 
                 ngClick: 'formReset()',
-                label: 'Reset',
-                'class': "btn btn-default",
-                icon: 'icon-undo',
                 ngDisabled: true          //Disabled when $pristine
                 }
             },
diff --git a/awx/ui/static/js/forms/HostGroups.js b/awx/ui/static/js/forms/HostGroups.js
index 127b73748f..5c02976ccb 100644
--- a/awx/ui/static/js/forms/HostGroups.js
+++ b/awx/ui/static/js/forms/HostGroups.js
@@ -38,17 +38,11 @@ angular.module('HostGroupsFormDefinition', [])
 
         buttons: { //for now always generates <button> tags 
             save: { 
-                label: 'Save', 
-                icon: 'icon-ok',
-                "class": 'btn-success',
                 ngClick: 'formSave()',    //$scope.function to call on click, optional
                 ngDisabled: true          //Disable when $pristine or $invalid, optional
                 },
             reset: { 
                 ngClick: 'formReset()',
-                label: 'Reset',
-                icon: 'icon-undo',
-                'class': 'btn btn-default',
                 ngDisabled: true          //Disabled when $pristine
                 }
             },
diff --git a/awx/ui/static/js/forms/Hosts.js b/awx/ui/static/js/forms/Hosts.js
index 4edd1b69cf..d8c7c240a9 100644
--- a/awx/ui/static/js/forms/Hosts.js
+++ b/awx/ui/static/js/forms/Hosts.js
@@ -80,17 +80,11 @@ angular.module('HostFormDefinition', [])
 
         buttons: { //for now always generates <button> tags 
             save: { 
-                label: 'Save', 
-                icon: 'icon-ok',
-                "class": 'btn-success',
                 ngClick: 'formSave()',    //$scope.function to call on click, optional
                 ngDisabled: true          //Disable when $pristine or $invalid, optional
                 },
             reset: { 
                 ngClick: 'formReset()',
-                label: 'Reset',
-                icon: 'icon-undo',
-                'class': 'btn btn-default',
                 ngDisabled: true          //Disabled when $pristine
                 }
             },
diff --git a/awx/ui/static/js/forms/Inventories.js b/awx/ui/static/js/forms/Inventories.js
index 48dd7cd6e4..4ae131714a 100644
--- a/awx/ui/static/js/forms/Inventories.js
+++ b/awx/ui/static/js/forms/Inventories.js
@@ -96,17 +96,11 @@ angular.module('InventoryFormDefinition', [])
 
         buttons: { //for now always generates <button> tags 
             save: { 
-                label: 'Save', 
-                icon: 'icon-ok',
-                "class": 'btn-success',
                 ngClick: 'formSave()',    //$scope.function to call on click, optional
                 ngDisabled: true          //Disable when $pristine or $invalid, optional
                 },
             reset: { 
                 ngClick: 'formReset()',
-                label: 'Reset',
-                icon: 'icon-undo',
-                'class': 'btn btn-default',
                 ngDisabled: true          //Disabled when $pristine
                 }
             },
diff --git a/awx/ui/static/js/forms/JobTemplates.js b/awx/ui/static/js/forms/JobTemplates.js
index 4095922b96..6222d70cb3 100644
--- a/awx/ui/static/js/forms/JobTemplates.js
+++ b/awx/ui/static/js/forms/JobTemplates.js
@@ -268,17 +268,11 @@ angular.module('JobTemplateFormDefinition', [])
 
         buttons: { //for now always generates <button> tags 
             save: { 
-                label: 'Save', 
-                icon: 'icon-ok',
-                "class": 'btn-success',
                 ngClick: 'formSave()',    //$scope.function to call on click, optional
                 ngDisabled: true          //Disable when $pristine or $invalid, optional
                 },
             reset: { 
                 ngClick: 'formReset()',
-                label: 'Reset',
-                icon: 'icon-undo',
-                'class': 'btn btn-default',
                 ngDisabled: true          //Disabled when $pristine
                 }
             },
diff --git a/awx/ui/static/js/forms/Organizations.js b/awx/ui/static/js/forms/Organizations.js
index c3c5dfe47e..7b3c378beb 100644
--- a/awx/ui/static/js/forms/Organizations.js
+++ b/awx/ui/static/js/forms/Organizations.js
@@ -46,17 +46,11 @@ angular.module('OrganizationFormDefinition', [])
 
         buttons: { //for now always generates <button> tags	
             save: { 
-                label: 'Save', 
-                icon: 'icon-ok',
-                "class": 'btn-success',
                 ngClick: 'formSave()',    //$scope.function to call on click, optional
                 ngDisabled: true          //Disable when $pristine or $invalid, optional
                 },
             reset: { 
                 ngClick: 'formReset()',
-                label: 'Reset',
-                icon: 'icon-undo',
-                'class': 'btn btn-default',
                 ngDisabled: true          //Disabled when $pristine
                 }
             },
diff --git a/awx/ui/static/js/forms/Permissions.js b/awx/ui/static/js/forms/Permissions.js
index e044d73724..65d2f2de53 100644
--- a/awx/ui/static/js/forms/Permissions.js
+++ b/awx/ui/static/js/forms/Permissions.js
@@ -91,17 +91,11 @@ angular.module('PermissionFormDefinition', [])
 
         buttons: { //for now always generates <button> tags 
             save: { 
-                label: 'Save', 
-                icon: 'icon-ok',
-                "class": 'btn-success',
                 ngClick: 'formSave()',    //$scope.function to call on click, optional
                 ngDisabled: true          //Disable when $pristine or $invalid, optional
                 },
             reset: { 
                 ngClick: 'formReset()',
-                label: 'Reset',
-                icon: 'icon-undo',
-                'class': 'btn btn-default',
                 ngDisabled: true          //Disabled when $pristine
                 }
             },
diff --git a/awx/ui/static/js/forms/Projects.js b/awx/ui/static/js/forms/Projects.js
index 89c4ae4fdf..5ebc7b7ddc 100644
--- a/awx/ui/static/js/forms/Projects.js
+++ b/awx/ui/static/js/forms/Projects.js
@@ -200,17 +200,11 @@ angular.module('ProjectFormDefinition', [])
 
         buttons: { //for now always generates <button> tags 
             save: { 
-                label: 'Save', 
-                icon: 'icon-ok',
-                "class": 'btn-success',
                 ngClick: 'formSave()',    //$scope.function to call on click, optional
                 ngDisabled: true          //Disable when $pristine or $invalid, optional
                 },
             reset: { 
                 ngClick: 'formReset()',
-                label: 'Reset',
-                icon: 'icon-undo',
-                'class': 'btn btn-default',
                 ngDisabled: true          //Disabled when $pristine
                 }
             },
diff --git a/awx/ui/static/js/forms/Teams.js b/awx/ui/static/js/forms/Teams.js
index fee9a76d6a..9253370db9 100644
--- a/awx/ui/static/js/forms/Teams.js
+++ b/awx/ui/static/js/forms/Teams.js
@@ -58,17 +58,11 @@ angular.module('TeamFormDefinition', [])
 
         buttons: { //for now always generates <button> tags 
             save: { 
-                label: 'Save', 
-                icon: 'icon-ok',
-                "class": 'btn-success',
                 ngClick: 'formSave()',    //$scope.function to call on click, optional
                 ngDisabled: true          //Disable when $pristine or $invalid, optional
                 },
             reset: { 
                 ngClick: 'formReset()',
-                label: 'Reset',
-                icon: 'icon-undo',
-                'class': 'btn btn-default',
                 ngDisabled: true          //Disabled when $pristine
                 }
             },
diff --git a/awx/ui/static/js/forms/Users.js b/awx/ui/static/js/forms/Users.js
index 65d8f32531..b7d09fbcba 100644
--- a/awx/ui/static/js/forms/Users.js
+++ b/awx/ui/static/js/forms/Users.js
@@ -102,17 +102,11 @@ angular.module('UserFormDefinition', [])
 
         buttons: { //for now always generates <button> tags 
             save: { 
-                label: 'Save', 
-                icon: 'icon-ok',
-                "class": 'btn-success',
                 ngClick: 'formSave()',    //$scope.function to call on click, optional
                 ngDisabled: true          //Disable when $pristine or $invalid, optional
                 },
             reset: { 
                 ngClick: 'formReset()',
-                label: 'Reset',
-                icon: 'icon-undo',
-                'class': 'btn btn-default',
                 ngDisabled: true          //Disabled when $pristine
                 }
             },
diff --git a/awx/ui/static/lib/ansible/form-generator.js b/awx/ui/static/lib/ansible/form-generator.js
index 8c1b867264..878118518f 100644
--- a/awx/ui/static/lib/ansible/form-generator.js
+++ b/awx/ui/static/lib/ansible/form-generator.js
@@ -1202,10 +1202,22 @@ angular.module('FormGenerator', ['GeneratorHelpers', 'ngCookies', 'Utilities'])
                 html += "<div class=\"";
                 html += (this.form.buttons['controlClass']) ? this.form.buttons['controlClass'] : "col-lg-6"; 
                 html += " controls\">\n";
+                
                 for (var btn in this.form.buttons) {
                     if (typeof this.form.buttons[btn] == 'object') {
                        var button = this.form.buttons[btn];
-                       //button
+
+                       // Set default color and label for Save and Reset
+                       if (btn == 'save') {
+                           button.label = 'Save';
+                           button['class'] = 'btn-success';
+                       }
+                       if (btn == 'reset') {
+                           button.label = 'Reset';
+                           button['class'] = 'btn-default';
+                       }
+                       
+                       // Build button HTML
                        html += "<button type=\"button\" ";
                        html += "class=\"btn btn-sm";
                        html += (button['class']) ? " " + button['class'] : "";
diff --git a/awx/ui/static/lib/ansible/list-generator.js b/awx/ui/static/lib/ansible/list-generator.js
index 4105930112..a8d56ec5d2 100644
--- a/awx/ui/static/lib/ansible/list-generator.js
+++ b/awx/ui/static/lib/ansible/list-generator.js
@@ -148,7 +148,7 @@ angular.module('ListGenerator', ['GeneratorHelpers'])
                   if (typeof navigation[itm] == 'object' && navigation[itm].active) {
                      html += "<a href=\"\" class=\"toggle\" ";
                      html += "data-toggle=\"dropdown\" ";
-                     html += ">" + navigation[itm].label + " <i class=\"icon-chevron-sign-down crumb-icon\"></i></a>";
+                     html += ">" + navigation[itm].label + " <i class=\"fa fa-chevron-circle-down crumb-icon\"></i></a>";
                      break;
                   }
               }
@@ -254,11 +254,11 @@ angular.module('ListGenerator', ['GeneratorHelpers'])
                  awPopOver: list.selectInstructions,
                  dataPlacement: 'left',
                  dataContainer: 'body',
-                 icon: "icon-question-sign",
+                 icon: "fa-question-circle",
                  'class': 'btn-xs btn-help',
                  awToolTip: 'Click for help',
                  dataTitle: 'Help',
-                 iconSize: 'large'
+                 iconSize: 'fa-lg'
                  };
              html += this.button(btn, 'select');
           }
@@ -409,7 +409,7 @@ angular.module('ListGenerator', ['GeneratorHelpers'])
        if (options.mode == 'select' && (options.selectButton == undefined || options.selectButton == true)) {
            html += "<div class=\"navigation-buttons\">\n";
            html += " <button class=\"btn btn-sm btn-primary pull-right\" aw-tool-tip=\"Complete your selection\" " +
-               "ng-click=\"finishSelection()\" ng-disabled=\"disableSelectBtn\"><i class=\"icon-check\"></i> Select</button>\n";
+               "ng-click=\"finishSelection()\" ng-disabled=\"disableSelectBtn\"><i class=\"fa fa-check\"></i> Select</button>\n";
            html += "</div>\n";
        }