diff --git a/awx/ui/client/src/shared/bootstrap-settings.less b/awx/ui/client/src/shared/bootstrap-settings.less
index 47b3ae08f9..72c63c771e 100644
--- a/awx/ui/client/src/shared/bootstrap-settings.less
+++ b/awx/ui/client/src/shared/bootstrap-settings.less
@@ -20,7 +20,3 @@
 		background: @btn-bg-sel;
 	}
 }
-.List-tableRow .badge, {
-	padding: 3px 15px;
-	border-radius: 6px;
-}
\ No newline at end of file
diff --git a/awx/ui/client/src/shared/generator-helpers.js b/awx/ui/client/src/shared/generator-helpers.js
index c14f46cdda..1fcb580d8a 100644
--- a/awx/ui/client/src/shared/generator-helpers.js
+++ b/awx/ui/client/src/shared/generator-helpers.js
@@ -282,7 +282,7 @@ angular.module('GeneratorHelpers', [systemStatus.name])
                     html += (field.dataPlacement) ? " data-placement=\"" + field.dataPlacement + "\"" : "";
                     html += ">";
                 }
-                html += "<span class=\"badge\"";
+                html += "<span class=\"badge List-titleBadge\"";
                 html += " aw-tool-tip=\"" + field.awToolTip + "\"";
                 html += (field.dataPlacement) ? " data-placement=\"" + field.dataPlacement + "\"" : "";
                 html += (field['class']) ? " " + field['class'] : "";