diff --git a/app/assets/stylesheets/common/base/category-list.scss b/app/assets/stylesheets/common/base/category-list.scss
index 4abcf9f3dd7..73e2a05462e 100644
--- a/app/assets/stylesheets/common/base/category-list.scss
+++ b/app/assets/stylesheets/common/base/category-list.scss
@@ -35,7 +35,7 @@
     border-left-width: 6px;
 
     border-style: solid;
-    border-color: blend-primary-secondary(20%);
+    border-color: $primary-low;
 
     .mobile-view & {
       width: 100%;
@@ -67,7 +67,7 @@
     border-left-width: 0;
 
     border-style: solid;
-    border-color: blend-primary-secondary(20%);
+    border-color: $primary-low;
   }
 
   &.no-logos {
@@ -174,7 +174,7 @@
   .featured-topics {
     padding: 0.5em 1em 1em 1em;
     ul {
-      color: blend-primary-secondary(70%);
+      color: $primary-medium;
       list-style: none;
       padding: 0;
       margin: 0;
diff --git a/app/assets/stylesheets/common/base/directory.scss b/app/assets/stylesheets/common/base/directory.scss
index bedecb8d553..b12ce4ff1a8 100644
--- a/app/assets/stylesheets/common/base/directory.scss
+++ b/app/assets/stylesheets/common/base/directory.scss
@@ -12,7 +12,7 @@
     float: right;
   }
   .total-rows {
-    color: blend-primary-secondary(50%);
+    color: $primary-medium;
     text-align: right;
   }
   .spinner {
diff --git a/app/assets/stylesheets/common/base/emoji.scss b/app/assets/stylesheets/common/base/emoji.scss
index 30a4757ca4f..3fc296b6e42 100644
--- a/app/assets/stylesheets/common/base/emoji.scss
+++ b/app/assets/stylesheets/common/base/emoji.scss
@@ -18,7 +18,7 @@ sup img.emoji {
   display: none;
   flex-direction: row;
   height: 300px;
-  color: dark-light-choose(darken($primary, 40%), blend-primary-secondary(90%));
+  color: $primary;
   background-color: $secondary;
   border: 1px solid $primary-low;
 }
diff --git a/app/assets/stylesheets/common/base/groups.scss b/app/assets/stylesheets/common/base/groups.scss
index 883a157976f..ec70a0ed43d 100644
--- a/app/assets/stylesheets/common/base/groups.scss
+++ b/app/assets/stylesheets/common/base/groups.scss
@@ -1,10 +1,3 @@
-.groups-page {
-  h1 {
-    margin-bottom: 20px;
-    display: inline-block;
-  }
-}
-
 .groups-header {
   margin-bottom: 30px;
 }
diff --git a/app/assets/stylesheets/common/base/mobile.scss b/app/assets/stylesheets/common/base/mobile.scss
deleted file mode 100644
index a3de111b39a..00000000000
--- a/app/assets/stylesheets/common/base/mobile.scss
+++ /dev/null
@@ -1 +0,0 @@
-// file no longer needed, mobile layout is in compose.scss
diff --git a/app/assets/stylesheets/desktop.scss b/app/assets/stylesheets/desktop.scss
index 566ff7a51e2..1769f2ee60b 100644
--- a/app/assets/stylesheets/desktop.scss
+++ b/app/assets/stylesheets/desktop.scss
@@ -20,7 +20,6 @@
 @import "desktop/history";
 @import "desktop/queued-posts";
 @import "desktop/group";
-@import "desktop/groups";
 @import "desktop/admin_customize";
 
 // Import all component-specific files
diff --git a/app/assets/stylesheets/desktop/group.scss b/app/assets/stylesheets/desktop/group.scss
index 458a6c5b258..680d94c63be 100644
--- a/app/assets/stylesheets/desktop/group.scss
+++ b/app/assets/stylesheets/desktop/group.scss
@@ -50,3 +50,11 @@
   top: 20px;
   right: 20px;
 }
+
+.groups-table {
+  thead {
+    .d-icon {
+      padding-left: 2px;
+    }
+  }
+}
diff --git a/app/assets/stylesheets/desktop/groups.scss b/app/assets/stylesheets/desktop/groups.scss
deleted file mode 100644
index b66a1b8366b..00000000000
--- a/app/assets/stylesheets/desktop/groups.scss
+++ /dev/null
@@ -1,11 +0,0 @@
-.groups-page {
-  .list-controls {
-    float: right;
-  }
-}
-
-thead {
-  .d-icon {
-    padding-left: 2px;
-  }
-}