diff --git a/src/lib/feature/comment/Comment.svelte b/src/lib/feature/comment/Comment.svelte
index a6f69677..b5649368 100644
--- a/src/lib/feature/comment/Comment.svelte
+++ b/src/lib/feature/comment/Comment.svelte
@@ -31,8 +31,6 @@
 
   interface Props {
     node: CommentNodeI
-    postId: number
-    op?: boolean
     actions?: boolean
     meta?: boolean
     open?: boolean
@@ -45,8 +43,6 @@
 
   let {
     node = $bindable(),
-    postId,
-    op = false,
     actions = true,
     meta = true,
     replying = $bindable(false),
@@ -125,6 +121,8 @@
   id={node.comment_view.comment.id.toString()}
 >
   {#if meta}
+    {@const creatorIsOp =
+      node.comment_view.creator.id == node.comment_view.post.creator_id}
     <label
       for="comment-expand-{node.comment_view.comment.id}"
       class="flex flex-row cursor-pointer gap-2 items-center group text-sm flex-wrap w-full z-0 group relative"
@@ -154,7 +152,12 @@
         </div>
       </div>
       {@render metaSuffix?.()}
-      <span class:font-bold={op} class="flex flex-row gap-1 items-center">
+      <span
+        class={[
+          'flex flex-row gap-1 items-center',
+          creatorIsOp && 'text-blue-600 dark:text-blue-400 font-bold',
+        ]}
+      >
         <UserLink
           inComment
           avatarSize={20}
@@ -182,8 +185,13 @@
             {/if}
           {/snippet}
         </UserLink>
-        {#if op}
-          <Icon mini size="16" src={Microphone} class="text-sky-600" />
+        {#if creatorIsOp}
+          <Icon
+            mini
+            size="16"
+            src={Microphone}
+            class="text-blue-500 dark:text-blue-400"
+          />
         {/if}
       </span>
       <RelativeDate
@@ -281,7 +289,7 @@
         <div transition:slide={{ duration: 600, easing: expoOut }}>
           <CommentForm
             label={$t('comment.reply')}
-            {postId}
+            postId={node.comment_view.post.id}
             parentId={node.comment_view.comment.id}
             oncomment={(e) => {
               node.children = [
diff --git a/src/lib/feature/comment/CommentTree.svelte b/src/lib/feature/comment/CommentTree.svelte
index 0190bf9b..b8d37988 100644
--- a/src/lib/feature/comment/CommentTree.svelte
+++ b/src/lib/feature/comment/CommentTree.svelte
@@ -90,8 +90,6 @@
   {#each nodes as node, index (node.comment_view.comment.id)}
     <Comment
       bind:node={nodes[index]}
-      postId={post.id}
-      op={post.creator_id == node.comment_view.creator.id}
       contentClass={[
         (node.children.length > 0 ||
           node.comment_view.counts.child_count > 0) &&
diff --git a/src/lib/ui/generic/EntityHeader.svelte b/src/lib/ui/generic/EntityHeader.svelte
index 7c95b7c6..7d6fcc3b 100644
--- a/src/lib/ui/generic/EntityHeader.svelte
+++ b/src/lib/ui/generic/EntityHeader.svelte
@@ -70,7 +70,7 @@
         circle={avatarCircle}
         class={[
           'relative',
-          '-mt-8',
+          '-mt-4 @md:-mt-8',
           !avatarCircle && 'rounded-xl @md:rounded-3xl!',
         ]}
       />
diff --git a/src/lib/ui/layout/pages/Tabs.svelte b/src/lib/ui/layout/pages/Tabs.svelte
index ddda32f5..8f532a6d 100644
--- a/src/lib/ui/layout/pages/Tabs.svelte
+++ b/src/lib/ui/layout/pages/Tabs.svelte
@@ -97,16 +97,15 @@
     @variant sm {
       margin-top: 0;
     }
-
-    margin-left: calc(var(--spacing) * -3);
-    margin-right: calc(var(--spacing) * -3);
-    margin-top: calc(var(--spacing) * -1);
   }
 
   .tab-bar.bar-header {
     padding: calc(var(--spacing));
     gap: calc(var(--spacing) * 1) calc(var(--spacing) * 2);
     justify-content: center;
+    margin-left: calc(var(--spacing) * -3);
+    margin-right: calc(var(--spacing) * -3);
+    margin-top: calc(var(--spacing) * -1);
 
     @variant sm {
       justify-content: start;