diff --git a/awx/ui/client/lib/components/components.strings.js b/awx/ui/client/lib/components/components.strings.js
index 52ffdb1f1c..03ac4085a3 100644
--- a/awx/ui/client/lib/components/components.strings.js
+++ b/awx/ui/client/lib/components/components.strings.js
@@ -79,7 +79,10 @@ function ComponentsStrings (BaseString) {
 
     ns.relaunch = {
         DEFAULT: t.s('Relaunch using the same parameters'),
-        HOSTS: t.s('Relaunch using host parameters')
+        HOSTS: t.s('Relaunch using host parameters'),
+        DROPDOWN_TITLE: t.s('Relaunch On'),
+        ALL: t.s('All'),
+        FAILED: t.s('Failed')
     };
 }
 
diff --git a/awx/ui/client/lib/components/index.js b/awx/ui/client/lib/components/index.js
index c82d8dc77e..e2608b2866 100644
--- a/awx/ui/client/lib/components/index.js
+++ b/awx/ui/client/lib/components/index.js
@@ -26,7 +26,7 @@ import tab from '~components/tabs/tab.directive';
 import tabGroup from '~components/tabs/group.directive';
 import topNavItem from '~components/layout/top-nav-item.directive';
 import truncate from '~components/truncate/truncate.directive';
-import relaunch from '~components/relaunchButton/relaunchButton.directive';
+import relaunch from '~components/relaunchButton/relaunchButton.component';
 
 import BaseInputController from '~components/input/base.controller';
 import ComponentsStrings from '~components/components.strings';
diff --git a/awx/ui/client/lib/components/relaunchButton/relaunchButton.directive.js b/awx/ui/client/lib/components/relaunchButton/relaunchButton.component.js
similarity index 74%
rename from awx/ui/client/lib/components/relaunchButton/relaunchButton.directive.js
rename to awx/ui/client/lib/components/relaunchButton/relaunchButton.component.js
index 0d50f02d90..089abf8625 100644
--- a/awx/ui/client/lib/components/relaunchButton/relaunchButton.directive.js
+++ b/awx/ui/client/lib/components/relaunchButton/relaunchButton.component.js
@@ -6,8 +6,7 @@ const atRelaunch = {
         state: '<'
     },
     controller: ['RelaunchJob', 'InitiatePlaybookRun', 'ComponentsStrings', '$scope', atRelaunchCtrl],
-    controllerAs: 'vm',
-    replace: true
+    controllerAs: 'vm'
 };
 
 function atRelaunchCtrl (RelaunchJob, InitiatePlaybookRun, strings, $scope) {
@@ -19,6 +18,26 @@ function atRelaunchCtrl (RelaunchJob, InitiatePlaybookRun, strings, $scope) {
         vm.showRelaunch = !(job.type === 'system_job') && job.summary_fields.user_capabilities.start;
         vm.showDropdown = job.type === 'job' && job.failed === true;
 
+        vm.createDropdown();
+        vm.createTooltips();
+    };
+
+    vm.createDropdown = () => {
+        vm.icon = 'icon-launch';
+        vm.dropdownTitle = strings.get('relaunch.DROPDOWN_TITLE');
+        vm.dropdownOptions = [
+            {
+                name: strings.get('relaunch.ALL'),
+                icon: 'icon-host-all'
+            },
+            {
+                name: strings.get('relaunch.FAILED'),
+                icon: 'icon-host-failed'
+            }
+        ];
+    };
+
+    vm.createTooltips = () => {
         if (vm.showDropdown) {
             vm.tooltip = strings.get('relaunch.HOSTS');
         } else {
diff --git a/awx/ui/client/lib/components/relaunchButton/relaunchButton.partial.html b/awx/ui/client/lib/components/relaunchButton/relaunchButton.partial.html
index eca5f42fc4..5ce4c45c17 100644
--- a/awx/ui/client/lib/components/relaunchButton/relaunchButton.partial.html
+++ b/awx/ui/client/lib/components/relaunchButton/relaunchButton.partial.html
@@ -8,14 +8,14 @@
             data-toggle="dropdown"
             aria-expanded="false"
             id="relaunchDropdown">
-            <i class="{{ vm.state.icon }}"></i>
+            <i class="{{ vm.icon }}"></i>
         </button>
 
         <ul class="dropdown-menu pull-right" aria-labelledby="relaunchDropdown">
             <li class="at-Relaunch--dropdownTitle">
-                <span>{{ vm.state.dropdownTitle }}</span>
+                <span>{{ vm.dropdownTitle }}</span>
             </li>
-            <li ng-repeat="option in vm.state.dropdownOptions"
+            <li ng-repeat="option in vm.dropdownOptions"
                 class="at-Relaunch--dropdownOptions">
                 <a ng-click="vm.relaunchOn(option)">
                     <i class="fa {{ option.icon }}"></i>
@@ -28,6 +28,6 @@
     <button class="at-Relaunch--button"
             ng-click="vm.relaunchJob()"
             ng-if="!vm.showDropdown">
-            <i class="{{ vm.state.icon }}"></i>
+            <i class="{{ vm.icon }}"></i>
     </button>
 </div>
\ No newline at end of file
diff --git a/awx/ui/client/src/job-results/job-results.block.less b/awx/ui/client/src/job-results/job-results.block.less
index c05d872b74..356aeb5a6a 100644
--- a/awx/ui/client/src/job-results/job-results.block.less
+++ b/awx/ui/client/src/job-results/job-results.block.less
@@ -55,6 +55,10 @@
     text-transform: uppercase;
 }
 
+.JobResults-panelHeaderButtonActions {
+    display: flex;
+}
+
 .JobResults-resultRow {
     width: 100%;
     display: flex;
diff --git a/awx/ui/client/src/job-results/job-results.partial.html b/awx/ui/client/src/job-results/job-results.partial.html
index e8ec250e31..904b88857f 100644
--- a/awx/ui/client/src/job-results/job-results.partial.html
+++ b/awx/ui/client/src/job-results/job-results.partial.html
@@ -19,18 +19,10 @@
                     </div>
 
                     <!-- LEFT PANE HEADER ACTIONS -->
-                    <div>
+                    <div class="JobResults-panelHeaderButtonActions">
 
                         <!-- RELAUNCH ACTION -->
-                        <button class="List-actionButton"
-                            data-placement="top"
-                            mode="all"
-                            ng-click="relaunchJob()"
-                            aw-tool-tip="{{'Relaunch using the same parameters' | translate}}"
-                            data-original-title=""
-                            title="">
-                            <i class="icon-launch"></i>
-                        </button>
+                        <at-relaunch state="job"></at-relaunch>
 
                         <!-- CANCEL ACTION -->
                         <button class="List-actionButton
diff --git a/awx/ui/client/src/job-submission/job-submission-factories/launchjob.factory.js b/awx/ui/client/src/job-submission/job-submission-factories/launchjob.factory.js
index 3e521fa4fe..e3020d20bb 100644
--- a/awx/ui/client/src/job-submission/job-submission-factories/launchjob.factory.js
+++ b/awx/ui/client/src/job-submission/job-submission-factories/launchjob.factory.js
@@ -133,13 +133,9 @@ export default
                         job_launch_data.diff_mode = scope.other_prompt_data.diff_mode;
                     }
 
-                    if(scope.relaunchHostType) {
+                    if(!Empty(scope.relaunchHostType)) {
                         job_launch_data.hosts = scope.relaunchHostType;
                     }
-                    console.log(job_launch_data);
-                    // if(_.get(scope, 'retry_counts.failed') === true) {
-                    //     job_launch_data.hosts = "failed";
-                    // }
 
                     // If the extra_vars dict is empty, we don't want to include it if we didn't prompt for anything.
                     if(jQuery.isEmptyObject(job_launch_data.extra_vars)===true && scope.prompt_for_vars===false){
diff --git a/awx/ui/client/src/jobs/all-jobs.list.js b/awx/ui/client/src/jobs/all-jobs.list.js
index 4d3109842e..19744982e9 100644
--- a/awx/ui/client/src/jobs/all-jobs.list.js
+++ b/awx/ui/client/src/jobs/all-jobs.list.js
@@ -99,17 +99,6 @@ export default ['i18n', function(i18n) {
                 dataPlacement: 'top',
                 ngShow: "!(job.type == 'system_job') && job.summary_fields.user_capabilities.start",
                 relaunch: true,
-                dropdownTitle: 'Relaunch On',
-                dropdownOptions: [
-                    {
-                        name: 'All',
-                        icon: 'icon-host-all'
-                    },
-                    {
-                        name: 'Failed',
-                        icon: 'icon-host-failed'
-                    }
-                ],
             },
             cancel: {
                 mode: 'all',
diff --git a/awx/ui/client/src/shared/list-generator/list-generator.factory.js b/awx/ui/client/src/shared/list-generator/list-generator.factory.js
index b6e37705c2..ae174cc2b2 100644
--- a/awx/ui/client/src/shared/list-generator/list-generator.factory.js
+++ b/awx/ui/client/src/shared/list-generator/list-generator.factory.js
@@ -398,7 +398,7 @@ export default ['$compile', 'Attr', 'Icon',
                             }
                             // Plug in Dropdown Component
                             if (field_action === 'submit' && list.fieldActions[field_action].relaunch === true) {
-                                innerTable += `<at-relaunch scope='$scope' state='list.fieldActions.submit'></at-relaunch>`
+                                innerTable += `<at-relaunch></at-relaunch>`
                             } else {
                                 fAction = list.fieldActions[field_action];
                                 innerTable += "<button id=\"";