diff --git a/templates/repo/diff/compare.tmpl b/templates/repo/diff/compare.tmpl
index 1ded53195e..3a8130df16 100644
--- a/templates/repo/diff/compare.tmpl
+++ b/templates/repo/diff/compare.tmpl
@@ -41,10 +41,10 @@
 				</div>
 				<div class="branch-tag-tab">
 					<a class="reference column branch-tag-item text black" href="#" data-target=".base-branch-list">
-						{{svg "octicon-git-branch" 16 "tw-mr-1"}}{{ctx.Locale.Tr "repo.branches"}}
+						{{svg "octicon-git-branch"}}{{ctx.Locale.Tr "repo.branches"}}
 					</a>
 					<a class="reference column branch-tag-item text black" href="#" data-target=".base-tag-list">
-						{{svg "octicon-tag" 16 "tw-mr-1"}}{{ctx.Locale.Tr "repo.tags"}}
+						{{svg "octicon-tag"}}{{ctx.Locale.Tr "repo.tags"}}
 					</a>
 				</div>
 				<div class="scrolling menu reference-list-menu base-branch-list">
@@ -102,10 +102,10 @@
 				</div>
 				<div class="branch-tag-tab">
 					<a class="reference column branch-tag-item text black" href="#" data-target=".head-branch-list">
-						{{svg "octicon-git-branch" 16 "tw-mr-1"}}{{ctx.Locale.Tr "repo.branches"}}
+						{{svg "octicon-git-branch"}}{{ctx.Locale.Tr "repo.branches"}}
 					</a>
 					<a class="reference column branch-tag-item text black" href="#" data-target=".head-tag-list">
-						{{svg "octicon-tag" 16 "tw-mr-1"}}{{ctx.Locale.Tr "repo.tags"}}
+						{{svg "octicon-tag"}}{{ctx.Locale.Tr "repo.tags"}}
 					</a>
 				</div>
 				<div class="scrolling menu reference-list-menu head-branch-list">
diff --git a/templates/repo/issue/view_content/sidebar/branch_selector_field.tmpl b/templates/repo/issue/view_content/sidebar/branch_selector_field.tmpl
index 9ba856a74b..08cfc8d0c9 100644
--- a/templates/repo/issue/view_content/sidebar/branch_selector_field.tmpl
+++ b/templates/repo/issue/view_content/sidebar/branch_selector_field.tmpl
@@ -17,10 +17,10 @@
 		</div>
 		<div class="branch-tag-tab">
 			<a class="reference column branch-tag-item text black" href="#" data-target="#branch-list">
-				{{svg "octicon-git-branch" 16 "tw-mr-1"}}{{ctx.Locale.Tr "repo.branches"}}
+				{{svg "octicon-git-branch"}}{{ctx.Locale.Tr "repo.branches"}}
 			</a>
 			<a class="reference column branch-tag-item text black" href="#" data-target="#tag-list">
-				{{svg "octicon-tag" 16 "tw-mr-1"}}{{ctx.Locale.Tr "repo.tags"}}
+				{{svg "octicon-tag"}}{{ctx.Locale.Tr "repo.tags"}}
 			</a>
 		</div>
 		<div class="branch-tag-divider"></div>
diff --git a/web_src/css/repo.css b/web_src/css/repo.css
index b3e7efc76e..ccf580d5ec 100644
--- a/web_src/css/repo.css
+++ b/web_src/css/repo.css
@@ -1158,7 +1158,9 @@ td .commit-summary {
 }
 
 .branch-tag-item {
-  display: inline-block;
+  display: inline-flex;
+  align-items: center;
+  gap: 0.5rem;
   padding: 10px;
   border: 1px solid transparent;
   border-bottom: none;
diff --git a/web_src/js/components/RepoBranchTagSelector.vue b/web_src/js/components/RepoBranchTagSelector.vue
index ef9f5e89ce..cd86499ddc 100644
--- a/web_src/js/components/RepoBranchTagSelector.vue
+++ b/web_src/js/components/RepoBranchTagSelector.vue
@@ -265,10 +265,10 @@ export default sfc; // activate IDE's Vue plugin
       </div>
       <div v-if="showBranchesInDropdown" class="branch-tag-tab">
         <a class="branch-tag-item muted" :class="{active: mode === 'branches'}" href="#" @click="handleTabSwitch('branches')">
-          <svg-icon name="octicon-git-branch" :size="16" class="tw-mr-1"/>{{ textBranches }}
+          <svg-icon name="octicon-git-branch" :size="16"/>{{ textBranches }}
         </a>
         <a v-if="!noTag" class="branch-tag-item muted" :class="{active: mode === 'tags'}" href="#" @click="handleTabSwitch('tags')">
-          <svg-icon name="octicon-tag" :size="16" class="tw-mr-1"/>{{ textTags }}
+          <svg-icon name="octicon-tag" :size="16"/>{{ textTags }}
         </a>
       </div>
       <div class="branch-tag-divider"/>