diff --git a/src/view/com/composer/text-input/web/TagDecorator.ts b/src/view/com/composer/text-input/web/TagDecorator.ts
index 022e0be4ca..3d0d8193f2 100644
--- a/src/view/com/composer/text-input/web/TagDecorator.ts
+++ b/src/view/com/composer/text-input/web/TagDecorator.ts
@@ -38,7 +38,7 @@ function getDecorations(doc: ProsemirrorNode) {
 
         decorations.push(
           Decoration.inline(pos + from, pos + to, {
-            class: 'autolink',
+            class: 'inline-tag',
           }),
         )
       }
diff --git a/web/index.html b/web/index.html
index 2224a1fbbc..7cd266603d 100644
--- a/web/index.html
+++ b/web/index.html
@@ -48,6 +48,9 @@
         --text: black;
         --background: white;
         --backgroundLight: #F3F3F8;
+        --blue: #0085ff;
+        --teal: #9AD5CA;
+        --yellow: #FED766;
       }
       html.colorMode--dark {
         --text: white;
@@ -136,17 +139,36 @@
       .tippy-content .items {
         width: fit-content;
       }
-      .ProseMirror .inline-tag {
+
+      /* Hashtags in ProseMirror */
+      .ProseMirror .inline-tag,
+      .ProseMirror .mention {
         position: relative;
+        margin: 0 3px;
       }
-      .ProseMirror .inline-tag::after {
+      .ProseMirror .inline-tag::after,
+      .ProseMirror .mention::after {
         content: '';
         position: absolute;
-        top: 0;
-        bottom: 0;
-        left: 0;
-        right: 0;
-        background-color: whitesmoke;
+        top: -1px;
+        bottom: -2px;
+        left: -3px;
+        right: -3px;
+        z-index: -1;
+        opacity: 0.3;
+        border-radius: 4px;
+      }
+      .ProseMirror .inline-tag {
+        color: var(--teal);
+      }
+      .ProseMirror .inline-tag::after {
+        background-color: var(--teal);
+      }
+      .ProseMirror .mention {
+        color: var(--yellow);
+      }
+      .ProseMirror .mention::after {
+        background-color: var(--yellow);
       }
 
       /* Tooltips */