diff --git a/options/locale/locale_en-US.ini b/options/locale/locale_en-US.ini
index 5f945f0d0f..deff5f471e 100644
--- a/options/locale/locale_en-US.ini
+++ b/options/locale/locale_en-US.ini
@@ -1831,7 +1831,6 @@ issues.review.remove_review_request_self = refused to review %s
 issues.review.add_remove_review_requests = requested reviews from %[1]s and removed review requests for %[2]s %[3]s
 issues.review.pending = Pending
 issues.review.pending.tooltip = This comment is not currently visible to other users. To submit your pending comments, select "%s" -> "%s/%s/%s" at the top of the page.
-issues.review.review = Review
 issues.review.reviewers = Reviewers
 issues.review.outdated = Outdated
 issues.review.outdated_description = Content has changed since this comment was made
diff --git a/templates/repo/diff/comments.tmpl b/templates/repo/diff/comments.tmpl
index b36f20269e..3128149c75 100644
--- a/templates/repo/diff/comments.tmpl
+++ b/templates/repo/diff/comments.tmpl
@@ -33,19 +33,15 @@
 			<div class="comment-header-right actions tw-flex tw-items-center">
 				{{if .Invalidated}}
 					{{$referenceUrl := printf "%s#%s" $.root.Issue.Link .HashTag}}
-					<a href="{{AppSubUrl}}{{$referenceUrl}}" class="ui label basic small" data-tooltip-content="{{ctx.Locale.Tr "repo.issues.review.outdated_description"}}">
+					<a href="{{AppSubUrl}}{{$referenceUrl}}" class="ui label" data-tooltip-content="{{ctx.Locale.Tr "repo.issues.review.outdated_description"}}">
 						{{ctx.Locale.Tr "repo.issues.review.outdated"}}
 					</a>
 				{{end}}
 				{{if and .Review}}
 					{{if eq .Review.Type 0}}
-						<div class="ui label basic small yellow pending-label" data-tooltip-content="{{ctx.Locale.Tr "repo.issues.review.pending.tooltip" (ctx.Locale.Tr "repo.diff.review") (ctx.Locale.Tr "repo.diff.review.approve") (ctx.Locale.Tr "repo.diff.review.comment") (ctx.Locale.Tr "repo.diff.review.reject")}}">
+						<div class="ui label yellow pending-label" data-tooltip-content="{{ctx.Locale.Tr "repo.issues.review.pending.tooltip" (ctx.Locale.Tr "repo.diff.review") (ctx.Locale.Tr "repo.diff.review.approve") (ctx.Locale.Tr "repo.diff.review.comment") (ctx.Locale.Tr "repo.diff.review.reject")}}">
 						{{ctx.Locale.Tr "repo.issues.review.pending"}}
 						</div>
-					{{else}}
-						<div class="ui label basic small">
-						{{ctx.Locale.Tr "repo.issues.review.review"}}
-						</div>
 					{{end}}
 				{{end}}
 				{{template "repo/issue/view_content/add_reaction" dict "ctxData" $.root "ActionURL" (printf "%s/comments/%d/reactions" $.root.RepoLink .ID)}}
diff --git a/templates/repo/diff/conversation.tmpl b/templates/repo/diff/conversation.tmpl
index c80d999f47..9753bd80e1 100644
--- a/templates/repo/diff/conversation.tmpl
+++ b/templates/repo/diff/conversation.tmpl
@@ -14,7 +14,7 @@
 					We only handle the case $resolved=true and $invalid=true in this template because if the comment is not resolved it has the outdated label in the comments area (not the header above).
 					The case $resolved=false and $invalid=true is handled in repo/diff/comments.tmpl
 					-->
-					<a href="{{AppSubUrl}}{{$referenceUrl}}" class="ui label basic small tw-ml-2" data-tooltip-content="{{ctx.Locale.Tr "repo.issues.review.outdated_description"}}">
+					<a href="{{AppSubUrl}}{{$referenceUrl}}" class="ui label tw-ml-2" data-tooltip-content="{{ctx.Locale.Tr "repo.issues.review.outdated_description"}}">
 						{{ctx.Locale.Tr "repo.issues.review.outdated"}}
 					</a>
 				{{end}}
diff --git a/templates/repo/issue/view_content/conversation.tmpl b/templates/repo/issue/view_content/conversation.tmpl
index 4f70e799a2..a802d930fd 100644
--- a/templates/repo/issue/view_content/conversation.tmpl
+++ b/templates/repo/issue/view_content/conversation.tmpl
@@ -7,7 +7,7 @@
 		<div class="tw-flex tw-items-center">
 			<a href="{{(index .comments 0).CodeCommentLink ctx}}" class="file-comment tw-ml-2 tw-break-anywhere">{{(index .comments 0).TreePath}}</a>
 			{{if $invalid}}
-				<span class="ui label basic small tw-ml-2" data-tooltip-content="{{ctx.Locale.Tr "repo.issues.review.outdated_description"}}">
+				<span class="ui label tw-ml-2" data-tooltip-content="{{ctx.Locale.Tr "repo.issues.review.outdated_description"}}">
 					{{ctx.Locale.Tr "repo.issues.review.outdated"}}
 				</span>
 			{{end}}
diff --git a/templates/repo/issue/view_content/show_role.tmpl b/templates/repo/issue/view_content/show_role.tmpl
index 0f1b895501..878a943bb9 100644
--- a/templates/repo/issue/view_content/show_role.tmpl
+++ b/templates/repo/issue/view_content/show_role.tmpl
@@ -1,5 +1,5 @@
 {{if and .ShowRole.IsPoster (not .IgnorePoster)}}
-	<div class="ui basic label role-label" data-tooltip-content="
+	<div class="ui label role-label" data-tooltip-content="
 		{{if .IsPull}}
 			{{ctx.Locale.Tr "repo.issues.author.tooltip.pr"}}
 		{{else}}
@@ -9,7 +9,7 @@
 	</div>
 {{end}}
 {{if .ShowRole.RoleInRepo}}
-	<div class="ui basic label role-label" data-tooltip-content="{{.ShowRole.RoleInRepo.LocaleHelper ctx.Locale}}">
+	<div class="ui label role-label" data-tooltip-content="{{.ShowRole.RoleInRepo.LocaleHelper ctx.Locale}}">
 		{{.ShowRole.RoleInRepo.LocaleString ctx.Locale}}
 	</div>
 {{end}}
diff --git a/web_src/css/repo.css b/web_src/css/repo.css
index bdb09eb776..1277954b14 100644
--- a/web_src/css/repo.css
+++ b/web_src/css/repo.css
@@ -2248,7 +2248,7 @@ details.repo-search-result summary::marker {
 }
 
 .timeline .ui.comment-header {
-  padding: 0.5rem 1rem;
+  padding: 0.25rem 0.75rem;
 }
 
 .comment-header::before,
diff --git a/web_src/css/themes/theme-forgejo-dark.css b/web_src/css/themes/theme-forgejo-dark.css
index bc321f38a8..c9c538502d 100644
--- a/web_src/css/themes/theme-forgejo-dark.css
+++ b/web_src/css/themes/theme-forgejo-dark.css
@@ -326,8 +326,8 @@ i.grey.icon.icon.icon.icon {
 .ui.ui.ui.basic.primary.label {
   color: var(--color-text-dark) !important;
 }
-.ui.basic.yellow.label.pending-label {
-  background: var(--color-light) !important;
+.ui.yellow.label.pending-label {
+  color: var(--color-warning-text) !important;
 }
 ::selection {
   background: var(--steel-100) !important;
diff --git a/web_src/css/themes/theme-forgejo-light.css b/web_src/css/themes/theme-forgejo-light.css
index c86ea53314..a5e4ffe050 100644
--- a/web_src/css/themes/theme-forgejo-light.css
+++ b/web_src/css/themes/theme-forgejo-light.css
@@ -314,10 +314,9 @@
 .ui.ui.ui.basic.primary.label {
   color: var(--color-text-dark) !important;
 }
-.ui.basic.yellow.label.pending-label {
+.ui.yellow.label.pending-label {
   background: var(--color-warning-bg) !important;
-  color: var(--color-warning-text) !important;
-  border-color: var(--color-yellow-light) !important;
+  color: var(--color-text-dark) !important;
 }
 ::selection {
   background: var(--steel-450) !important;