diff --git a/awx/ui/client/legacy-styles/forms.less b/awx/ui/client/legacy-styles/forms.less
index ed66d8de04..a54c0c6aed 100644
--- a/awx/ui/client/legacy-styles/forms.less
+++ b/awx/ui/client/legacy-styles/forms.less
@@ -494,7 +494,6 @@ input[type='radio']:checked:before {
 
 .Form-surveyButton {
     background-color: @default-link;
-    margin-right: 20px;
     color: @default-bg;
     text-transform: uppercase;
     padding-left:15px;
diff --git a/awx/ui/client/src/forms/JobTemplates.js b/awx/ui/client/src/forms/JobTemplates.js
index 0292a29b3d..cc82057048 100644
--- a/awx/ui/client/src/forms/JobTemplates.js
+++ b/awx/ui/client/src/forms/JobTemplates.js
@@ -309,17 +309,18 @@ export default
                     dataPlacement: 'right',
                     dataTitle: "Host Config Key",
                     dataContainer: "body"
-                },
-                survey: {
-                    type: 'custom',
-                    column: 2,
-                    ngHide: "job_type.value === 'scan'" ,
-                    control: '<button type="button" class="btn btn-sm Form-surveyButton" id="job_templates_create_survey_btn" ng-show="!survey_exists" ng-click="addSurvey()">ADD SURVEY</button>'+
-                            '<button type="button" class="btn btn-sm Form-surveyButton" id="job_templates_edit_survey_btn" ng-show="survey_exists" ng-click="editSurvey()">EDIT SURVEY</button>'
                 }
             },
 
             buttons: { //for now always generates <button> tags
+                add_survey: {
+                    ngClick: 'addSurvey()',
+                    ngShow: 'job_type.value !== "scan" && !survey_exists'
+                },
+                edit_survey: {
+                    ngClick: 'editSurvey()',
+                    ngShow: 'job_type.value !== "scan" && survey_exists'
+                },
                 cancel: {
                     ngClick: 'formCancel()'
                 },
diff --git a/awx/ui/client/src/job-templates/survey-maker/survey-maker.block.less b/awx/ui/client/src/job-templates/survey-maker/survey-maker.block.less
index c96e5fad54..9422f5b066 100644
--- a/awx/ui/client/src/job-templates/survey-maker/survey-maker.block.less
+++ b/awx/ui/client/src/job-templates/survey-maker/survey-maker.block.less
@@ -102,6 +102,7 @@
     text-transform: uppercase;
     padding-left:15px;
     padding-right: 15px;
+    margin-right: 20px;
 }
 .SurveyMaker-deleteButton:hover {
     background-color: @default-err-hov;
diff --git a/awx/ui/client/src/shared/form-generator.js b/awx/ui/client/src/shared/form-generator.js
index 70e0d97710..3771fc8fdc 100644
--- a/awx/ui/client/src/shared/form-generator.js
+++ b/awx/ui/client/src/shared/form-generator.js
@@ -1675,6 +1675,14 @@ angular.module('FormGenerator', [GeneratorHelpers.name, 'Utilities', listGenerat
                                     button.label = 'Launch';
                                     button['class'] = 'btn-primary';
                                 }
+                                if (btn === 'add_survey') {
+                                    button.label = 'Add Survey';
+                                    button['class'] = 'Form-surveyButton';
+                                }
+                                if (btn === 'edit_survey') {
+                                    button.label = 'Edit Survey';
+                                    button['class'] = 'Form-surveyButton';
+                                }
 
                                 // Build button HTML
                                 html += "<button type=\"button\" ";