diff --git a/client/galaxy/style/scss/base.scss b/client/galaxy/style/scss/base.scss
index 4dc783f2ded..10ad24c7dc4 100644
--- a/client/galaxy/style/scss/base.scss
+++ b/client/galaxy/style/scss/base.scss
@@ -223,11 +223,9 @@ body {
         align-items: center;
         justify-content: space-between;
     }
-
     .panel-header-buttons {
         order: 9999;
     }
-
     .panel-header-button {
         text-decoration: none;
         display: inline-block;
@@ -238,7 +236,6 @@ body {
         &:not(:last-child) {
             margin-right: 2px;
         }
-
         // Fade to maroon on hover
         &:hover {
             color: maroon;
@@ -269,12 +266,10 @@ body {
     z-index: 1000; // Above #dd-helper
     border-top: $layout-border;
     background: $navbar-default-bg;
-
     color: #555;
     a {
         color: #555;
     }
-
     .drag {
         position: absolute;
         top: 0;
diff --git a/client/galaxy/style/scss/collection.scss b/client/galaxy/style/scss/collection.scss
index 33fb76ff177..4fcc2f45b3e 100644
--- a/client/galaxy/style/scss/collection.scss
+++ b/client/galaxy/style/scss/collection.scss
@@ -29,46 +29,24 @@
     .vertically-spaced {
         margin-top: 4px;
     }
-
     > .controls {
-        margin: 8px 8px 1px;
-        padding: 0px;
-        // padding: 8px;
-
+        @extend .mx-3;
         .navigation {
-            margin-top: 4px;
             .back {
                 span {
-                    @extend .fa-lg;
-                    margin-right: 4px;
                     font-weight: bold;
                 }
             }
         }
         .title {
-            margin-top: 12px;
             .name {
                 font-weight: bold;
             }
         }
     }
-
     > .list-items {
         @extend .flex-column;
         overflow-x: hidden;
         overflow-y: auto;
-
-        &:not(:empty) {
-            border-top: 1px solid $border-default-color;
-        }
-        .list-item {
-            border-width: 1px 0px 0px 0px;
-            &:first-child {
-                border-top-width: 0px;
-            }
-            &:last-child {
-                border-bottom-width: 1px;
-            }
-        }
     }
 }
diff --git a/client/galaxy/style/scss/list-item.scss b/client/galaxy/style/scss/list-item.scss
index 9a3c8c3dc41..bf4acfbef64 100644
--- a/client/galaxy/style/scss/list-item.scss
+++ b/client/galaxy/style/scss/list-item.scss
@@ -145,7 +145,7 @@ $vertical-gap: 8px;
 
     .controls {
         & > *:not(:empty) {
-            margin-bottom: 8px;
+            @extend .mb-2;
         }
         .name {
             word-wrap: break-word;
diff --git a/static/style/blue/base.css b/static/style/blue/base.css
index 3b79a464211..f2d4b502a62 100644
--- a/static/style/blue/base.css
+++ b/static/style/blue/base.css
@@ -5628,7 +5628,7 @@ button.bg-dark:focus {
 .mx-2 {
   margin-right: 0.5rem !important; }
 
-.mb-2, .ui-portlet-section, #tool-search,
+.mb-2, .ui-portlet-section, #tool-search, .list-panel .controls > *:not(:empty),
 .my-2 {
   margin-bottom: 0.5rem !important; }
 
@@ -5646,7 +5646,8 @@ button.bg-dark:focus {
 .mr-3,
 .mx-3,
 .unified-panel-header,
-.list-item .primary-actions {
+.list-item .primary-actions,
+.dataset-collection-panel > .controls {
   margin-right: 1rem !important; }
 
 .mb-3,
@@ -5656,7 +5657,8 @@ button.bg-dark:focus {
 .ml-3,
 .mx-3,
 .unified-panel-header,
-.list-item .primary-actions {
+.list-item .primary-actions,
+.dataset-collection-panel > .controls {
   margin-left: 1rem !important; }
 
 .m-4 {
@@ -6890,7 +6892,7 @@ pre.code {
   -moz-osx-font-smoothing: grayscale; }
 
 /* makes the font 33% larger relative to the icon container */
-.fa-lg, .dataset-collection-panel > .controls .navigation .back span {
+.fa-lg {
   font-size: 1.33333em;
   line-height: 0.75em;
   vertical-align: -15%; }
@@ -6924,7 +6926,7 @@ pre.code {
   width: 2.14286em;
   top: 0.14286em;
   text-align: center; }
-  .fa-li.fa-lg, .dataset-collection-panel > .controls .navigation .back span.fa-li {
+  .fa-li.fa-lg {
     left: -1.85714em; }
 
 .fa-border {
@@ -13333,8 +13335,6 @@ div.permissionContainer {
 
 .list-panel {
   overflow: hidden; }
-  .list-panel .controls > *:not(:empty) {
-    margin-bottom: 8px; }
   .list-panel .controls .name {
     word-wrap: break-word;
     font-weight: bold; }
@@ -14137,30 +14137,15 @@ pre.peek {
 .dataset-collection-panel .vertically-spaced {
   margin-top: 4px; }
 
-.dataset-collection-panel > .controls {
-  margin: 8px 8px 1px;
-  padding: 0px; }
-  .dataset-collection-panel > .controls .navigation {
-    margin-top: 4px; }
-    .dataset-collection-panel > .controls .navigation .back span {
-      margin-right: 4px;
-      font-weight: bold; }
-  .dataset-collection-panel > .controls .title {
-    margin-top: 12px; }
-    .dataset-collection-panel > .controls .title .name {
-      font-weight: bold; }
+.dataset-collection-panel > .controls .navigation .back span {
+  font-weight: bold; }
+
+.dataset-collection-panel > .controls .title .name {
+  font-weight: bold; }
 
 .dataset-collection-panel > .list-items {
   overflow-x: hidden;
   overflow-y: auto; }
-  .dataset-collection-panel > .list-items:not(:empty) {
-    border-top: 1px solid #bfbfbf; }
-  .dataset-collection-panel > .list-items .list-item {
-    border-width: 1px 0px 0px 0px; }
-    .dataset-collection-panel > .list-items .list-item:first-child {
-      border-top-width: 0px; }
-    .dataset-collection-panel > .list-items .list-item:last-child {
-      border-bottom-width: 1px; }
 
 .job.list-item {
   border: 1px solid #bfbfbf; }