diff --git a/awx/ui/static/js/forms/Credentials.js b/awx/ui/static/js/forms/Credentials.js
index e2169aa2d1..f8d965ec68 100644
--- a/awx/ui/static/js/forms/Credentials.js
+++ b/awx/ui/static/js/forms/Credentials.js
@@ -121,7 +121,7 @@ angular.module('CredentialFormDefinition', [])
             reset: { 
                 ngClick: 'formReset()',
                 label: 'Reset',
-                icon: 'icon-remove',
+                icon: 'icon-trash',
                 ngDisabled: true          //Disabled when $pristine
                 }
             },
diff --git a/awx/ui/static/js/forms/Groups.js b/awx/ui/static/js/forms/Groups.js
index 59712e148d..9978b81efb 100644
--- a/awx/ui/static/js/forms/Groups.js
+++ b/awx/ui/static/js/forms/Groups.js
@@ -61,7 +61,7 @@ angular.module('GroupFormDefinition', [])
             reset: { 
                 ngClick: 'formReset()',
                 label: 'Reset',
-                icon: 'icon-remove',
+                icon: 'icon-trash',
                 ngDisabled: true          //Disabled when $pristine
                 }
             },
diff --git a/awx/ui/static/js/forms/Hosts.js b/awx/ui/static/js/forms/Hosts.js
index 806931ad3f..668337b27a 100644
--- a/awx/ui/static/js/forms/Hosts.js
+++ b/awx/ui/static/js/forms/Hosts.js
@@ -75,7 +75,7 @@ angular.module('HostFormDefinition', [])
             reset: { 
                 ngClick: 'formReset()',
                 label: 'Reset',
-                icon: 'icon-remove',
+                icon: 'icon-trash',
                 ngDisabled: true          //Disabled when $pristine
                 }
             },
diff --git a/awx/ui/static/js/forms/Inventories.js b/awx/ui/static/js/forms/Inventories.js
index 1e162fe329..f841d4f915 100644
--- a/awx/ui/static/js/forms/Inventories.js
+++ b/awx/ui/static/js/forms/Inventories.js
@@ -91,7 +91,7 @@ angular.module('InventoryFormDefinition', [])
             reset: { 
                 ngClick: 'formReset()',
                 label: 'Reset',
-                icon: 'icon-remove',
+                icon: 'icon-trash',
                 ngDisabled: true          //Disabled when $pristine
                 }
             },
@@ -166,7 +166,7 @@ angular.module('InventoryFormDefinition', [])
                         },
                     "delete": {
                         ngClick: "deleteHost(\{\{ host.id \}\}, '\{\{ host.name \}\}')",
-                        icon: 'icon-remove',
+                        icon: 'icon-trash',
                         label: 'Delete',
                         "class": 'btn-danger',
                         awToolTip: 'Permanently remove this host from the inventory'
diff --git a/awx/ui/static/js/forms/JobTemplates.js b/awx/ui/static/js/forms/JobTemplates.js
index b556293b78..a1f6703c92 100644
--- a/awx/ui/static/js/forms/JobTemplates.js
+++ b/awx/ui/static/js/forms/JobTemplates.js
@@ -231,7 +231,7 @@ angular.module('JobTemplateFormDefinition', [])
             reset: { 
                 ngClick: 'formReset()',
                 label: 'Reset',
-                icon: 'icon-remove',
+                icon: 'icon-trash',
                 ngDisabled: true          //Disabled when $pristine
                 }
             },
diff --git a/awx/ui/static/js/forms/Organizations.js b/awx/ui/static/js/forms/Organizations.js
index eed21b1721..d749820e13 100644
--- a/awx/ui/static/js/forms/Organizations.js
+++ b/awx/ui/static/js/forms/Organizations.js
@@ -42,7 +42,7 @@ angular.module('OrganizationFormDefinition', [])
             reset: { 
                 ngClick: 'formReset()',
                 label: 'Reset',
-                icon: 'icon-remove',
+                icon: 'icon-trash',
                 ngDisabled: true          //Disabled when $pristine
                 }
             },
@@ -87,7 +87,7 @@ angular.module('OrganizationFormDefinition', [])
                     "delete": {
                         label: 'Delete',
                         ngClick: "delete('users', \{\{ user.id \}\}, '\{\{ user.username \}\}', 'users')",
-                        icon: 'icon-remove',
+                        icon: 'icon-trash',
                         "class": 'btn-danger',
                         awToolTip: 'Remove user'
                         }
@@ -130,7 +130,7 @@ angular.module('OrganizationFormDefinition', [])
                     "delete": {
                         label: 'Delete',
                         ngClick: "delete('admins', \{\{ admin.id \}\}, '\{\{ admin.username \}\}', 'administrators')",
-                        icon: 'icon-remove',
+                        icon: 'icon-trash',
                         "class": 'btn-danger',
                         awToolTip: 'Remove administrator'
                         }
diff --git a/awx/ui/static/js/forms/Permissions.js b/awx/ui/static/js/forms/Permissions.js
index 078e6e5cb5..1e9f3677ab 100644
--- a/awx/ui/static/js/forms/Permissions.js
+++ b/awx/ui/static/js/forms/Permissions.js
@@ -97,7 +97,7 @@ angular.module('PermissionFormDefinition', [])
             reset: { 
                 ngClick: 'formReset()',
                 label: 'Reset',
-                icon: 'icon-remove',
+                icon: 'icon-trash',
                 ngDisabled: true          //Disabled when $pristine
                 }
             },
diff --git a/awx/ui/static/js/forms/Projects.js b/awx/ui/static/js/forms/Projects.js
index 67c3d2d374..ebdad0a37c 100644
--- a/awx/ui/static/js/forms/Projects.js
+++ b/awx/ui/static/js/forms/Projects.js
@@ -82,7 +82,7 @@ angular.module('ProjectFormDefinition', [])
             reset: { 
                 ngClick: 'formReset()',
                 label: 'Reset',
-                icon: 'icon-remove',
+                icon: 'icon-trash',
                 ngDisabled: true          //Disabled when $pristine
                 }
             },
@@ -123,7 +123,7 @@ angular.module('ProjectFormDefinition', [])
                     "delete": {
                         label: 'Delete',
                         ngClick: "delete('organizations', \{\{ organization.id \}\}, '\{\{ organization.name \}\}', 'organizations')",
-                        icon: 'icon-remove',
+                        icon: 'icon-trash',
                         "class": 'btn-danger',
                         awToolTip: 'Delete the organization'
                         }
diff --git a/awx/ui/static/js/forms/Teams.js b/awx/ui/static/js/forms/Teams.js
index bf9b619ffe..75281904ea 100644
--- a/awx/ui/static/js/forms/Teams.js
+++ b/awx/ui/static/js/forms/Teams.js
@@ -56,7 +56,7 @@ angular.module('TeamFormDefinition', [])
             reset: { 
                 ngClick: 'formReset()',
                 label: 'Reset',
-                icon: 'icon-remove',
+                icon: 'icon-trash',
                 ngDisabled: true          //Disabled when $pristine
                 }
             },
@@ -98,7 +98,7 @@ angular.module('TeamFormDefinition', [])
                     "delete": {
                         label: 'Delete',
                         ngClick: "delete('credentials', \{\{ credential.id \}\}, '\{\{ credential.name \}\}', 'credentials')",
-                        icon: 'icon-remove',
+                        icon: 'icon-trash',
                         "class": 'btn-danger',
                         awToolTip: 'Remove the credential'
                         }
@@ -154,7 +154,7 @@ angular.module('TeamFormDefinition', [])
                     "delete": {
                         label: 'Delete',
                         ngClick: "delete('permissions', \{\{ permission.id \}\}, '\{\{ permission.name \}\}', 'permissions')",
-                        icon: 'icon-remove',
+                        icon: 'icon-trash',
                         "class": 'btn-danger',
                         awToolTip: 'Delete the permission'
                         }
@@ -196,7 +196,7 @@ angular.module('TeamFormDefinition', [])
                     "delete": {
                         label: 'Delete',
                         ngClick: "delete('projects', \{\{ project.id \}\}, '\{\{ project.name \}\}', 'projects')",
-                        icon: 'icon-remove',
+                        icon: 'icon-trash',
                         "class": 'btn-danger',
                         awToolTip: 'Remove the project'
                         }
@@ -241,7 +241,7 @@ angular.module('TeamFormDefinition', [])
                     "delete": {
                         label: 'Delete',
                         ngClick: "delete('users', \{\{ user.id \}\}, '\{\{ user.username \}\}', 'users')",
-                        icon: 'icon-remove',
+                        icon: 'icon-terash',
                         "class": 'btn-danger',
                         awToolTip: 'Remove user'
                         }
diff --git a/awx/ui/static/js/forms/Users.js b/awx/ui/static/js/forms/Users.js
index ec64ad38e5..3626826a67 100644
--- a/awx/ui/static/js/forms/Users.js
+++ b/awx/ui/static/js/forms/Users.js
@@ -97,7 +97,7 @@ angular.module('UserFormDefinition', [])
             reset: { 
                 ngClick: 'formReset()',
                 label: 'Reset',
-                icon: 'icon-remove',
+                icon: 'icon-trash',
                 ngDisabled: true          //Disabled when $pristine
                 }
             },
@@ -139,7 +139,7 @@ angular.module('UserFormDefinition', [])
                     "delete": {
                         label: 'Delete',
                         ngClick: "delete('credentials', \{\{ credential.id \}\}, '\{\{ credential.name \}\}', 'credentials')",
-                        icon: 'icon-remove',
+                        icon: 'icon-trash',
                         "class": 'btn-danger',
                         awToolTip: 'Delete the credential'
                         }
@@ -197,7 +197,7 @@ angular.module('UserFormDefinition', [])
                     "delete": {
                         label: 'Delete',
                         ngClick: "delete('permissions', \{\{ permission.id \}\}, '\{\{ permission.name \}\}', 'permissions')",
-                        icon: 'icon-remove',
+                        icon: 'icon-trash',
                         "class": 'btn-danger',
                         awToolTip: 'Delete the permission'
                         }
diff --git a/awx/ui/static/js/lists/Credentials.js b/awx/ui/static/js/lists/Credentials.js
index a7cc044518..05af233a3e 100644
--- a/awx/ui/static/js/lists/Credentials.js
+++ b/awx/ui/static/js/lists/Credentials.js
@@ -65,7 +65,7 @@ angular.module('CredentialsListDefinition', [])
 
             "delete": {
                 ngClick: "deleteCredential(\{\{ credential.id \}\},'\{\{ credential.name \}\}')",
-                icon: 'icon-remove',
+                icon: 'icon-trash',
                 label: 'Delete',
                 "class": 'btn-small btn-danger',
                 awToolTip: 'Delete credential'
diff --git a/awx/ui/static/js/lists/Groups.js b/awx/ui/static/js/lists/Groups.js
index 7defefd43d..f71f60c083 100644
--- a/awx/ui/static/js/lists/Groups.js
+++ b/awx/ui/static/js/lists/Groups.js
@@ -64,7 +64,7 @@ angular.module('GroupListDefinition', [])
             "delete": {
                 label: 'Delete',
                 ngClick: "deleteGroup(\{\{ group.id \}\},'\{\{ group.name \}\}')",
-                icon: 'icon-remove',
+                icon: 'icon-trash',
                 "class": 'btn-small btn-danger',
                 awToolTip: 'Delete group'
                 }
diff --git a/awx/ui/static/js/lists/Hosts.js b/awx/ui/static/js/lists/Hosts.js
index d9874c5137..63ff081dfd 100644
--- a/awx/ui/static/js/lists/Hosts.js
+++ b/awx/ui/static/js/lists/Hosts.js
@@ -55,7 +55,7 @@ angular.module('HostListDefinition', [])
             "delete": {
                 label: 'Delete',
                 ngClick: "deleteHost(\{\{ host.id \}\},'\{\{ host.name \}\}')",
-                icon: 'icon-remove',
+                icon: 'icon-trash',
                 "class": 'btn-small btn-danger',
                 awToolTip: 'Delete host'
                 }
diff --git a/awx/ui/static/js/lists/Inventories.js b/awx/ui/static/js/lists/Inventories.js
index ae3314813f..7be94c8d7e 100644
--- a/awx/ui/static/js/lists/Inventories.js
+++ b/awx/ui/static/js/lists/Inventories.js
@@ -70,7 +70,7 @@ angular.module('InventoriesListDefinition', [])
             "delete": {
                 label: 'Delete',
                 ngClick: "deleteInventory(\{\{ inventory.id \}\},'\{\{ inventory.name \}\}')",
-                icon: 'icon-remove',
+                icon: 'icon-trash',
                 "class": 'btn-small btn-danger',
                 awToolTip: 'Delete inventory'
                 }
diff --git a/awx/ui/static/js/lists/JobTemplates.js b/awx/ui/static/js/lists/JobTemplates.js
index f462d241c3..aac5ad24f7 100644
--- a/awx/ui/static/js/lists/JobTemplates.js
+++ b/awx/ui/static/js/lists/JobTemplates.js
@@ -59,7 +59,7 @@ angular.module('JobTemplatesListDefinition', [])
             "delete": {
                 label: 'Delete',
                 ngClick: "deleteJobTemplate(\{\{ job_template.id \}\},'\{\{ job_template.name \}\}')",
-                icon: 'icon-remove',
+                icon: 'icon-trash',
                 "class": 'btn-danger btn-small',
                 awToolTip: 'Delete template'
                 }
diff --git a/awx/ui/static/js/lists/Jobs.js b/awx/ui/static/js/lists/Jobs.js
index aa4871fd4d..27f2b22296 100644
--- a/awx/ui/static/js/lists/Jobs.js
+++ b/awx/ui/static/js/lists/Jobs.js
@@ -103,7 +103,15 @@ angular.module('JobsListDefinition', [])
                 ngClick: 'deleteJob(\{\{ job.id \}\})',
                 "class": 'btn-danger btn-small',
                 awToolTip: 'Cancel job',
-                ngDisabled: "job.status != 'new' && job.status != 'pending' && job.status != 'running'"
+                ngShow: "job.status == 'pending' || job.status == 'running'"
+                },
+            "delete": {
+                icon: 'icon-trash',
+                mode: 'all',
+                ngClick: 'deleteJob(\{\{ job.id \}\})',
+                "class": 'btn-danger btn-small',
+                awToolTip: 'Delete this job',
+                ngShow: "job.status != 'pending' && job.status != 'running'"
                 }
             }
         });
diff --git a/awx/ui/static/js/lists/Organizations.js b/awx/ui/static/js/lists/Organizations.js
index 48db53229d..5683ddf023 100644
--- a/awx/ui/static/js/lists/Organizations.js
+++ b/awx/ui/static/js/lists/Organizations.js
@@ -50,7 +50,7 @@ angular.module('OrganizationListDefinition', [])
             "delete": {
                 label: 'Delete',
                 ngClick: "deleteOrganization(\{\{ organization.id \}\},'\{\{ organization.name \}\}')",
-                icon: 'icon-remove',
+                icon: 'icon-trash',
                 "class": 'btn-small btn-danger',
                 awToolTip: 'Delete organization'
                 }
diff --git a/awx/ui/static/js/lists/Permissions.js b/awx/ui/static/js/lists/Permissions.js
index 77e6a48a89..0cdbd8d0d1 100644
--- a/awx/ui/static/js/lists/Permissions.js
+++ b/awx/ui/static/js/lists/Permissions.js
@@ -64,7 +64,7 @@ angular.module('PermissionListDefinition', [])
             "delete": {
                 label: 'Delete',
                 ngClick: "deletePermission(\{\{ permission.id \}\},'\{\{ permission.name \}\}')",
-                icon: 'icon-remove',
+                icon: 'icon-trash',
                 "class": 'btn-small btn-danger',
                 awToolTip: 'Delete permission'
                 }
diff --git a/awx/ui/static/js/lists/Projects.js b/awx/ui/static/js/lists/Projects.js
index f7cc73c573..ab5a985a84 100644
--- a/awx/ui/static/js/lists/Projects.js
+++ b/awx/ui/static/js/lists/Projects.js
@@ -52,7 +52,7 @@ angular.module('ProjectsListDefinition', [])
             "delete": {
                 label: 'Delete',
                 ngClick: "deleteProject(\{\{ project.id \}\},'\{\{ project.name \}\}')",
-                icon: 'icon-remove',
+                icon: 'icon-trash',
                 "class": 'btn-small btn-danger',
                 awToolTip: 'Delete project'
                 }
diff --git a/awx/ui/static/js/lists/Teams.js b/awx/ui/static/js/lists/Teams.js
index dd7701d1ef..bd61ec8eab 100644
--- a/awx/ui/static/js/lists/Teams.js
+++ b/awx/ui/static/js/lists/Teams.js
@@ -57,7 +57,7 @@ angular.module('TeamsListDefinition', [])
             "delete": {
                 label: 'Delete',
                 ngClick: "deleteTeam(\{\{ team.id \}\},'\{\{ team.name \}\}')",
-                icon: 'icon-remove',
+                icon: 'icon-trash',
                 "class": 'btn-small btn-danger',
                 awToolTip: 'Delete team'
                 }
diff --git a/awx/ui/static/js/lists/Users.js b/awx/ui/static/js/lists/Users.js
index f8fe76ae7f..443e8690e3 100644
--- a/awx/ui/static/js/lists/Users.js
+++ b/awx/ui/static/js/lists/Users.js
@@ -57,7 +57,7 @@ angular.module('UserListDefinition', [])
             "delete": {
                 label: 'Delete',
                 ngClick: "deleteUser(\{\{ user.id \}\},'\{\{ user.username \}\}')",
-                icon: 'icon-remove',
+                icon: 'icon-trash',
                 "class": 'btn-small btn-danger',
                 awToolTip: 'Delete user'
                 }
diff --git a/awx/ui/static/lib/ansible/list-generator.js b/awx/ui/static/lib/ansible/list-generator.js
index 464fdffd92..a7a28a1c66 100644
--- a/awx/ui/static/lib/ansible/list-generator.js
+++ b/awx/ui/static/lib/ansible/list-generator.js
@@ -45,6 +45,8 @@ angular.module('ListGenerator', ['GeneratorHelpers'])
        html += (btn.dataPlacement) ? this.attr(btn, 'dataPlacement') : "";
        html += (btn.dataContainer) ? this.attr(btn, 'dataContainer') : "";
        html += (btn.dataTitle) ? this.attr(btn, 'dataTitle') : "";
+       html += (btn.ngShow) ? this.attr(btn, 'ngShow') : "";
+       html += (btn.ngHide) ? this.attr(btn, 'ngHide') : "";
        html += " >" + this.attr(btn,'icon');
        html += (btn.label) ? " " + btn.label : ""; 
        html += "</button> ";