diff --git a/app/javascript/mastodon/components/status_emoji_reactions_bar.jsx b/app/javascript/mastodon/components/status_emoji_reactions_bar.jsx
index ce0741c0c..603a217c5 100644
--- a/app/javascript/mastodon/components/status_emoji_reactions_bar.jsx
+++ b/app/javascript/mastodon/components/status_emoji_reactions_bar.jsx
@@ -34,16 +34,16 @@ class EmojiReactionButton extends React.PureComponent {
     const { name, url, staticUrl, count, me } = this.props;
 
     const classList = {
-      'emoji-reactions-bar__button': true,
-      'toggled': me,
+      'reactions-bar__item': true,
+      'active': me,
     };
 
     return (
       <button className={classNames(classList)} type='button' onClick={this.onClick}>
-        <span className='emoji'>
+        <span className='reactions-bar__item__emoji'>
           <EmojiView name={name} url={url} staticUrl={staticUrl} />
         </span>
-        <span className='count'>{count}</span>
+        <span className='reactions-bar__item__count'>{count}</span>
       </button>
     );
   }
diff --git a/app/javascript/styles/mastodon/components.scss b/app/javascript/styles/mastodon/components.scss
index 28a6ad559..0ab0a132b 100644
--- a/app/javascript/styles/mastodon/components.scss
+++ b/app/javascript/styles/mastodon/components.scss
@@ -1421,11 +1421,13 @@ body > [data-popper-placement] {
   display: flex;
   flex-wrap: wrap;
   gap: 4px 8px;
-  margin: 8px 0 2px 4px;
+  margin: 8px 0 2px 0;
 
   .emoji-reactions-bar__button {
-    background: lighten($ui-base-color, 16%);
-    border: 0;
+    background: $white;
+    border: 1px solid lighten($ui-base-color, 8%);
+    border-radius: 3px;
+    padding: 0 6px;
     cursor: pointer;
     display: flex;
     justify-items: center;
@@ -1433,7 +1435,8 @@ body > [data-popper-placement] {
     height: 20px;
 
     &.toggled {
-      background: darken($ui-primary-color, 16%);
+      background-color: mix($white, $ui-highlight-color, 80%);
+      border-color: mix(lighten($ui-base-color, 8%), $ui-highlight-color, 80%);
     }
 
     .emoji {
@@ -1457,7 +1460,7 @@ body > [data-popper-placement] {
   justify-content: space-between;
   align-items: center;
   gap: 18px;
-  margin-top: 16px;
+  //margin-top: 16px;
 }
 
 .detailed-status__action-bar-dropdown {