diff --git a/awx/ui/static/js/setup-menu/setup-item.block.less b/awx/ui/static/js/setup-menu/setup-item.block.less
index a084c776be..c62fc60d25 100644
--- a/awx/ui/static/js/setup-menu/setup-item.block.less
+++ b/awx/ui/static/js/setup-menu/setup-item.block.less
@@ -13,7 +13,7 @@
 
     @vertical-basis: 1.4rem;
 
-    padding: (@vertical-basis / 2) 0;
+    padding: @vertical-basis 0;
 
     color: black;
     flex: 1 0 100%;
@@ -36,6 +36,16 @@
         align-self: flex-start;
       }
 
+      // For some reason, credentials
+      // icon is taking up more space
+      // than it should; need to adjust
+      // it manually to line it up with
+      // others
+      &--credentials {
+        width: 4.3rem;
+        margin-left: -0.8rem;
+      }
+
       flex: none; // do not let the flex container adjust this width!
       width: @icon-large-size;
       align-self: center;
diff --git a/awx/ui/static/js/setup-menu/setup-menu.block.less b/awx/ui/static/js/setup-menu/setup-menu.block.less
index 5ecbd98121..080f54963e 100644
--- a/awx/ui/static/js/setup-menu/setup-menu.block.less
+++ b/awx/ui/static/js/setup-menu/setup-menu.block.less
@@ -8,37 +8,5 @@
     flex-direction: row;
     justify-content: flex-start;
     flex-wrap: wrap;
-
-    @media screen and (min-width: 571px) {
-        margin-top: -2.8rem;
-    }
-
-    &-block {
-        display: flex;
-        flex-direction: column;
-        color: white;
-        flex: 1 0 30%;
-        margin: 2.8rem;
-        max-width: 24rem;
-        transition: background-color 0.25s ease-in-out;
-        background-color: white;
-        &:hover, &:focus, &:active {
-            color: black;
-        }
-    }
-
-    .SetupItem-description {
-        font-family: merriweather;
-        font-weight: lighter;
-        color: black;
-    }
-
-    @media screen and (max-width: 930px) {
-        flex-flow: nowrap column;
-        &-block {
-            width: 100%;
-            max-width: inherit;
-        }
-    }
-
+    margin-left: -1rem;
 }
diff --git a/awx/ui/static/js/setup-menu/setup-menu.partial.html b/awx/ui/static/js/setup-menu/setup-menu.partial.html
index 4ff4382c25..f618a54a01 100644
--- a/awx/ui/static/js/setup-menu/setup-menu.partial.html
+++ b/awx/ui/static/js/setup-menu/setup-menu.partial.html
@@ -1,7 +1,7 @@
 <section id="htmlTemplate" class="Container">
   <nav class="SetupMenu Container-main">
       <a link-to="credentials" class="SetupItem HoverIcon Media">
-        <i class="SetupItem-icon HoverIcon-icon HoverIcon-icon--color Media-figure">
+        <i class="SetupItem-icon SetupItem-icon--credentials HoverIcon-icon HoverIcon-icon--color Media-figure">
           <aw-icon name="Credentials"></aw-icon>
         </i>
         <div class="Media-body">