diff --git a/app/assets/javascripts/discourse/templates/list/topic-list-item.raw.hbs b/app/assets/javascripts/discourse/templates/list/topic-list-item.raw.hbs
index 3ad017f622c..020e32ecf4b 100644
--- a/app/assets/javascripts/discourse/templates/list/topic-list-item.raw.hbs
+++ b/app/assets/javascripts/discourse/templates/list/topic-list-item.raw.hbs
@@ -1,5 +1,5 @@
 {{#if bulkSelectEnabled}}
-  <td class='star'>
+  <td class="bulk-select">
     <input type="checkbox" class="bulk-select">
   </td>
 {{/if}}
diff --git a/app/assets/javascripts/discourse/templates/topic-list-header.raw.hbs b/app/assets/javascripts/discourse/templates/topic-list-header.raw.hbs
index 9f4646b3ad3..9b530b0b69e 100644
--- a/app/assets/javascripts/discourse/templates/topic-list-header.raw.hbs
+++ b/app/assets/javascripts/discourse/templates/topic-list-header.raw.hbs
@@ -1,5 +1,5 @@
 {{#if bulkSelectEnabled}}
-  <th class='star'>
+  <th class="bulk-select">
     {{#if canBulkSelect}}
       {{raw "flat-button" class="bulk-select" icon="list" title="topics.bulk.toggle"}}
     {{/if}}
diff --git a/app/assets/stylesheets/desktop/discourse.scss b/app/assets/stylesheets/desktop/discourse.scss
index de85046e7a6..5f718e9502a 100644
--- a/app/assets/stylesheets/desktop/discourse.scss
+++ b/app/assets/stylesheets/desktop/discourse.scss
@@ -401,25 +401,7 @@ input {
   }
 }
 
-// Special elements
-#main {
-  a.star {
-    color: $secondary-medium;
 
-    &:before {
-      font-family: "FontAwesome";
-      content: "\f005";
-    }
-
-    @include hover {
-      opacity: 0.6;
-    }
-
-    &:active {
-      opacity: 1;
-    }
-  }
-}
 
 // Media Queries
 @media all
diff --git a/app/assets/stylesheets/desktop/topic-list.scss b/app/assets/stylesheets/desktop/topic-list.scss
index 5ed43bbb45e..347988a5580 100644
--- a/app/assets/stylesheets/desktop/topic-list.scss
+++ b/app/assets/stylesheets/desktop/topic-list.scss
@@ -65,20 +65,15 @@
     }
     button.bulk-select {
       padding: 0;
-      margin-right: 0.3em;
     }
 
-    .star {
-      width: 20px;
-      padding-right: 0;
-      .d-icon-star {
-        position: relative;
-      }
+    td.bulk-select {
+      padding: 10px;
       + .main-link {
-        padding-left: 5px;
+        padding-left: 0;
       }
     }
-
+    
     .badge-notification {
       position: relative;
       top: -2px;
@@ -165,11 +160,6 @@
     }
   }
 
-  .topic-list tbody tr.has-excerpt .star {
-    vertical-align: top;
-    margin-top: 3px;
-  }
-
   .topic-list.categories {
     a.title {
       color: $tertiary;
diff --git a/app/assets/stylesheets/desktop/topic-post.scss b/app/assets/stylesheets/desktop/topic-post.scss
index 4d1e95f0db4..e869ad4dfd2 100644
--- a/app/assets/stylesheets/desktop/topic-post.scss
+++ b/app/assets/stylesheets/desktop/topic-post.scss
@@ -305,11 +305,6 @@ nav.post-controls {
   .avatar { margin-right: 2px; }
 }
 
-a.star {
-  display: inline-block;
-  float: left;
-}
-
 .topic-map {
   margin: 20px 0;
   background: blend-primary-secondary(5%);
diff --git a/app/assets/stylesheets/mobile/topic-post.scss b/app/assets/stylesheets/mobile/topic-post.scss
index 4d827a511e6..e507b59fcdb 100644
--- a/app/assets/stylesheets/mobile/topic-post.scss
+++ b/app/assets/stylesheets/mobile/topic-post.scss
@@ -306,7 +306,6 @@ span.post-count {
   .btn {
     margin-bottom: 5px;
     margin-right: 10px;
-    .d-icon-star {margin-right: 5px;}
   }
 }