diff --git a/appview/pages/templates/repo/issues/fragments/issueListing.html b/appview/pages/templates/repo/issues/fragments/issueListing.html
index 515fafae..3d892b53 100644
--- a/appview/pages/templates/repo/issues/fragments/issueListing.html
+++ b/appview/pages/templates/repo/issues/fragments/issueListing.html
@@ -21,9 +21,9 @@
             {{ $state = "open" }}
         {{ end }}
 
-        <span class="inline-flex items-center rounded px-2 py-[5px] {{ $bgColor }} text-sm">
+        <span class="inline-flex items-center rounded px-2 py-[5px] {{ $bgColor }}">
             {{ i $icon "w-3 h-3 mr-1.5 text-white dark:text-white" }}
-            <span class="text-white dark:text-white">{{ $state }}</span>
+            <span class="text-white dark:text-white text-sm">{{ $state }}</span>
         </span>
 
         <span class="ml-1">
diff --git a/appview/pages/templates/repo/issues/issue.html b/appview/pages/templates/repo/issues/issue.html
index 8beb1fe5..8a1cd8a6 100644
--- a/appview/pages/templates/repo/issues/issue.html
+++ b/appview/pages/templates/repo/issues/issue.html
@@ -58,11 +58,11 @@
       {{ $icon = "circle-dot" }}
   {{ end }}
   <div class="inline-flex items-center gap-2">
-    <div id="state"
-      class="inline-flex items-center rounded px-3 py-1 {{ $bgColor }}">
-      {{ i $icon "w-4 h-4 mr-1.5 text-white" }}
-      <span class="text-white">{{ .Issue.State }}</span>
-    </div>
+    <span class="inline-flex items-center rounded px-2 py-[5px] {{ $bgColor }}">
+        {{ i $icon "w-3 h-3 mr-1.5 text-white dark:text-white" }}
+        <span class="text-white dark:text-white text-sm">{{ .Issue.State }}</span>
+    </span>
+
     <span class="text-gray-500 dark:text-gray-400 text-sm flex flex-wrap items-center gap-1">
       opened by
       {{ template "user/fragments/picHandleLink" .Issue.Did }}
diff --git a/appview/pages/templates/repo/pulls/fragments/pullHeader.html b/appview/pages/templates/repo/pulls/fragments/pullHeader.html
index d063f566..3f153ee0 100644
--- a/appview/pages/templates/repo/pulls/fragments/pullHeader.html
+++ b/appview/pages/templates/repo/pulls/fragments/pullHeader.html
@@ -1,5 +1,5 @@
 {{ define "repo/pulls/fragments/pullHeader" }}
-<header class="pb-4">
+<header class="pb-2">
     <h1 class="text-2xl dark:text-white">
         {{ .Pull.Title | description }}
         <span class="text-gray-500 dark:text-gray-400">#{{ .Pull.PullId }}</span>
@@ -17,15 +17,14 @@
     {{ $icon = "git-merge" }}
 {{ end }}
 
-<section class="mt-2">
+<section>
     <div class="flex items-center gap-2">
-        <div
-            id="state"
-            class="inline-flex items-center rounded px-3 py-1 {{ $bgColor }}"
+        <span
+            class="inline-flex items-center rounded px-2 py-[5px] {{ $bgColor }} text-sm"
         >
-            {{ i $icon "w-4 h-4 mr-1.5 text-white" }}
+            {{ i $icon "w-3 h-3 mr-1.5 text-white" }}
             <span class="text-white">{{ .Pull.State.String }}</span>
-        </div>
+        </span>
         <span class="text-gray-500 dark:text-gray-400 text-sm flex flex-wrap items-center gap-1">
             opened by
             {{ template "user/fragments/picHandleLink" .Pull.OwnerDid }}