diff --git a/awx/ui/client/features/applications/list-applications-users.view.html b/awx/ui/client/features/applications/list-applications-users.view.html
index f3e9375782..3f59963d6c 100644
--- a/awx/ui/client/features/applications/list-applications-users.view.html
+++ b/awx/ui/client/features/applications/list-applications-users.view.html
@@ -1,4 +1,4 @@
-<div class="at-List-toolbar">
+<div class="at-List-toolbar at-List--toolbar-padAbove">
     <smart-search
         class="at-List-search"
         django-model="users"
diff --git a/awx/ui/client/features/credentials/add-edit-credentials.view.html b/awx/ui/client/features/credentials/add-edit-credentials.view.html
index 182eadf004..f86fc34767 100644
--- a/awx/ui/client/features/credentials/add-edit-credentials.view.html
+++ b/awx/ui/client/features/credentials/add-edit-credentials.view.html
@@ -31,7 +31,7 @@
 <at-panel ng-if="$state.current.name.includes('permissions')" on-dismiss="credentials">
     <at-panel-heading>{{:: vm.strings.get('permissions.TITLE') }}</at-panel-heading>
 
-    <at-tab-group>
+    <at-tab-group class="at-TabGroup--padBelow">
         <at-tab state="vm.tab.details">{{:: vm.strings.get('tab.DETAILS') }}</at-tab>
         <at-tab state="vm.tab.permissions">{{:: vm.strings.get('tab.PERMISSIONS') }}</at-tab>
     </at-tab-group>
diff --git a/awx/ui/client/lib/components/list/_index.less b/awx/ui/client/lib/components/list/_index.less
index c1cbe89a09..3991d7757b 100644
--- a/awx/ui/client/lib/components/list/_index.less
+++ b/awx/ui/client/lib/components/list/_index.less
@@ -25,6 +25,10 @@
     margin-bottom: @at-margin-bottom-list-toolbar;
 }
 
+.at-List--toolbar-padAbove{
+    margin-top: @at-margin-above-list-toolbar
+}
+
 .at-List-search {
     flex: auto;
 }
diff --git a/awx/ui/client/lib/theme/_variables.less b/awx/ui/client/lib/theme/_variables.less
index d800549010..bd36b0edab 100644
--- a/awx/ui/client/lib/theme/_variables.less
+++ b/awx/ui/client/lib/theme/_variables.less
@@ -267,6 +267,7 @@
 
 @at-margin-top-list: @at-space-4x;
 @at-margin-bottom-list-toolbar: @at-space-4x;
+@at-margin-above-list-toolbar: @at-space-4x;
 @at-margin-left-toolbar-action: @at-space-4x;
 @at-margin-left-toolbar-carat: @at-space;
 @at-margin-bottom-list-header: @at-space;
diff --git a/awx/ui/client/src/instance-groups/instances/instances-list.partial.html b/awx/ui/client/src/instance-groups/instances/instances-list.partial.html
index 2e51bd7fea..129637d1f0 100644
--- a/awx/ui/client/src/instance-groups/instances/instances-list.partial.html
+++ b/awx/ui/client/src/instance-groups/instances/instances-list.partial.html
@@ -3,7 +3,7 @@
         {{ vm.panelTitle }}
     </at-panel-heading>
 
-    <at-tab-group>
+    <at-tab-group class="at-TabGroup--padBelow">
         <at-tab state="vm.tab.details">{{:: vm.strings.get('tab.DETAILS') }}</at-tab>
         <at-tab state="vm.tab.instances">{{:: vm.strings.get('tab.INSTANCES') }}</at-tab>
         <at-tab state="vm.tab.jobs" ng-hide="$state.current.name === 'instanceGroups.add'">{{:: vm.strings.get('tab.JOBS') }}</at-tab>