diff --git a/src/view/com/Tag.tsx b/src/view/com/Tag.tsx
index 8dbceb5357..3c0cd180f2 100644
--- a/src/view/com/Tag.tsx
+++ b/src/view/com/Tag.tsx
@@ -89,16 +89,16 @@ export function EditableTag({
       onPointerEnter={hoverIn}
       onPointerLeave={hoverOut}
       style={state => [
-        pal.border,
+        pal.viewLight,
         styles.tag,
         {
-          opacity: hovered || state.pressed || state.focused ? 0.8 : 1,
+          opacity: state.pressed || state.focused ? 0.8 : 1,
           outline: 0,
           paddingRight: 6,
         },
       ]}>
       <Text
-        type="xs-medium"
+        type="sm-medium"
         style={[pal.textLight, {lineHeight: 13, paddingBottom: 2}]}>
         #{value}
       </Text>
@@ -106,10 +106,12 @@ export function EditableTag({
         icon="x"
         style={
           {
-            color: hovered ? pal.textLight.color : pal.border.borderColor,
+            opacity: hovered ? 1 : 0.5,
+            color: pal.textLight.color,
+            marginTop: -1,
           } as FontAwesomeIconStyle
         }
-        size={8}
+        size={11}
       />
     </Pressable>
   )
@@ -119,12 +121,11 @@ const styles = StyleSheet.create({
   tag: {
     flexDirection: 'row',
     alignItems: 'center',
-    gap: 4,
-    paddingTop: 1,
-    paddingBottom: 2,
-    paddingHorizontal: 6,
-    borderRadius: 20,
+    gap: 6,
+    paddingTop: 4,
+    paddingBottom: 3,
+    paddingHorizontal: 8,
+    borderRadius: 4,
     overflow: 'hidden',
-    borderWidth: 1,
   },
 })
diff --git a/src/view/com/composer/TagInput.tsx b/src/view/com/composer/TagInput.tsx
index 400494f082..6a2f86d5ea 100644
--- a/src/view/com/composer/TagInput.tsx
+++ b/src/view/com/composer/TagInput.tsx
@@ -140,13 +140,9 @@ const styles = StyleSheet.create({
   input: {
     flexGrow: 1,
     minWidth: 100,
-    fontSize: 13,
-    paddingVertical: 4,
-  },
-  tag: {
-    paddingVertical: 4,
-    paddingHorizontal: 8,
-    borderRadius: 4,
-    overflow: 'hidden',
+    fontSize: 14,
+    lineHeight: 14,
+    paddingTop: 4,
+    paddingBottom: 6,
   },
 })
diff --git a/web/index.html b/web/index.html
index 0b86ede66f..fabbe35eff 100644
--- a/web/index.html
+++ b/web/index.html
@@ -155,7 +155,7 @@
       .ProseMirror .mention {
         border-radius: 4px;
         background-color: var(--backgroundLight);
-        padding: 0 2px 1px;
+        padding: 0 3px 2px;
 
         /* This approach works, but we can't do rounded corners
         background-color: var(--backgroundLight);