diff --git a/templates/repo/issue/view_content/sidebar/due_deadline.tmpl b/templates/repo/issue/view_content/sidebar/due_deadline.tmpl
index b37c4462a5..e788f1ca61 100644
--- a/templates/repo/issue/view_content/sidebar/due_deadline.tmpl
+++ b/templates/repo/issue/view_content/sidebar/due_deadline.tmpl
@@ -5,8 +5,7 @@
 		{{ctx.Locale.Tr "repo.issues.due_date_invalid"}}
 	</div>
 	{{if ne .Issue.DeadlineUnix 0}}
-		<p></p>
-		<div class="tw-flex tw-justify-between tw-items-center">
+		<div class="tw-flex tw-justify-between tw-items-center tw-mt-4">
 			<div class="due-date {{if .Issue.IsOverdue}}text red{{end}}" {{if .Issue.IsOverdue}}data-tooltip-content="{{ctx.Locale.Tr "repo.issues.due_date_overdue"}}"{{end}}>
 				{{svg "octicon-calendar" 16 "tw-mr-2"}}
 				{{DateUtils.AbsoluteLong .Issue.DeadlineUnix}}
diff --git a/templates/repo/issue/view_content/sidebar/reference.tmpl b/templates/repo/issue/view_content/sidebar/reference.tmpl
index 98e2a19256..15d1add8c3 100644
--- a/templates/repo/issue/view_content/sidebar/reference.tmpl
+++ b/templates/repo/issue/view_content/sidebar/reference.tmpl
@@ -10,11 +10,8 @@
 			{{ctx.Locale.Tr "discussion.sidebar.reference"}}
 		</strong>
 	</span>
-	<p></p>
-	<div class="ui equal width compact grid">
-		<div class="row tw-items-center" data-tooltip-content="{{$issueReferenceLink}}">
-			<span class="text column truncate">{{$issueReferenceLink}}</span>
-			<button class="ui two wide button column tw-p-2" data-tooltip-content="{{ctx.Locale.Tr "copy"}}" data-clipboard-text="{{$issueReferenceLink}}">{{svg "octicon-copy" 14}}</button>
-		</div>
+	<div class="ui tw-flex tw-justify-between tw-items-end tw-mt-1" data-tooltip-content="{{$issueReferenceLink}}">
+		<span class="text column truncate">{{$issueReferenceLink}}</span>
+		<button class="ui two wide button column tw-p-2" data-tooltip-content="{{ctx.Locale.Tr "copy"}}" data-clipboard-text="{{$issueReferenceLink}}">{{svg "octicon-copy" 14}}</button>
 	</div>
 </div>
diff --git a/templates/repo/issue/view_content/sidebar/timetracking.tmpl b/templates/repo/issue/view_content/sidebar/timetracking.tmpl
index 62df3d7f38..7cc10b1a52 100644
--- a/templates/repo/issue/view_content/sidebar/timetracking.tmpl
+++ b/templates/repo/issue/view_content/sidebar/timetracking.tmpl
@@ -53,8 +53,7 @@
 	{{end}}
 	<div class="ui comments">
 		<span class="text"><strong>{{ctx.Locale.Tr "repo.issues.time_spent_from_all_authors" ($.Issue.TotalTrackedTime | Sec2Time)}}</strong></span>
-		<p></p>
-		<div>
+		<div class="tw-mt-4">
 			{{range $user, $trackedtime := .WorkingUsers}}
 				<div class="comment tw-mt-2">
 					<a class="avatar">