diff --git a/templates/repo/commit_page.tmpl b/templates/repo/commit_page.tmpl
index f43050ad0e..70cc7d02ea 100644
--- a/templates/repo/commit_page.tmpl
+++ b/templates/repo/commit_page.tmpl
@@ -17,8 +17,8 @@
 				{{$class = (printf "%s%s" $class " isWarning")}}
 			{{end}}
 		{{end}}
-		<div class="ui top attached header clearing segment pr {{$class}}">
-			<div class="df mb-4">
+		<div class="ui top attached header clearing segment pr commit-header {{$class}}">
+			<div class="df mb-4 fw">
 				<h3 class="mb-0 f1"><span class="commit-summary" title="{{.Commit.Summary}}">{{RenderCommitMessage $.Context .Commit.Message $.RepoLink $.Repository.ComposeMetas}}</span>{{template "repo/commit_statuses" dict "Status" .CommitStatus "Statuses" .CommitStatuses  "root" $}}</h3>
 				{{if not $.PageIsWiki}}
 					<div class="ui">
@@ -143,8 +143,8 @@
 				<span class="text grey mr-3">{{svg "octicon-tag" 16 "mr-2"}}{{.TagName}}</span>
 			{{end}}
 		</div>
-		<div class="ui attached segment df ac sb py-2 commit-header-row {{$class}}">
-				<div class="df ac">
+		<div class="ui attached segment df ac sb py-2 commit-header-row fw {{$class}}">
+				<div class="df ac author">
 					{{if .Author}}
 						{{avatar .Author 28 "mr-3"}}
 						{{if .Author.FullName}}
@@ -171,9 +171,7 @@
 				<div class="ui horizontal list df ac">
 					{{if .Parents}}
 						<div class="item">
-							{{.i18n.Tr "repo.diff.parent"}}
-						</div>
-						<div class="item">
+							<span>{{.i18n.Tr "repo.diff.parent"}}</span>
 							{{range .Parents}}
 								{{if $.PageIsWiki}}
 									<a class="ui blue sha label" href="{{$.RepoLink}}/wiki/commit/{{PathEscape .}}">{{ShortSha .}}</a>
@@ -183,13 +181,14 @@
 							{{end}}
 						</div>
 					{{end}}
-					<div class="mobile-only"></div>
-					<div class="item">{{.i18n.Tr "repo.diff.commit"}}</div>
-					<div class="item"><span class="ui blue sha label">{{ShortSha .CommitID}}</span></div>
+					<div class="item">
+						<span>{{.i18n.Tr "repo.diff.commit"}}</span>
+						<span class="ui blue sha label">{{ShortSha .CommitID}}</span>
+					</div>
 				</div>
 		</div>
 		{{if .Commit.Signature}}
-			<div class="ui bottom attached message tl df ac sb commit-header-row {{$class}}">
+			<div class="ui bottom attached message tl df ac sb commit-header-row fw {{$class}}">
 				<div class="df ac">
 					{{if .Verification.Verified}}
 						{{if ne .Verification.SigningUser.ID 0}}
@@ -204,8 +203,8 @@
 							{{avatar .Verification.SigningUser 28}}
 							<a href="{{.Verification.SigningUser.HomeLink}}"><strong>{{.Verification.SigningUser.GetDisplayName}}</strong></a>
 						{{else}}
-							<span title="{{.i18n.Tr "gpg.default_key"}}">{{svg "gitea-lock-cog"}}</span>
-							<span class="ui text">{{.i18n.Tr "repo.commits.signed_by"}}:</span>
+							<span title="{{.i18n.Tr "gpg.default_key"}}">{{svg "gitea-lock-cog" 16 "mr-3"}}</span>
+							<span class="ui text mr-3">{{.i18n.Tr "repo.commits.signed_by"}}:</span>
 							{{avatarByEmail .Verification.SigningEmail "" 28}}
 							<strong>{{.Verification.SigningUser.GetDisplayName}}</strong>
 						{{end}}
diff --git a/templates/repo/commits_list.tmpl b/templates/repo/commits_list.tmpl
index 86ad835202..65baee6b63 100644
--- a/templates/repo/commits_list.tmpl
+++ b/templates/repo/commits_list.tmpl
@@ -1,5 +1,5 @@
-<div class="ui attached table segment">
-		<table class="ui very basic striped fixed table single line" id="commits-table">
+<div class="ui attached table segment commit-table">
+		<table class="ui very basic striped table unstackable fixed" id="commits-table">
 			<thead>
 				<tr>
 					<th class="four wide">{{.i18n.Tr "repo.commits.author"}}</th>
diff --git a/web_src/less/_repository.less b/web_src/less/_repository.less
index 13f9384ba0..f8a23e071a 100644
--- a/web_src/less/_repository.less
+++ b/web_src/less/_repository.less
@@ -3328,4 +3328,83 @@ td.blob-excerpt {
       }
     }
   }
+  .commit-header-row {
+    .ui.horizontal.list {
+      width: 100%;
+      overflow-x: scroll;
+      margin-top: 2px;
+
+      .item {
+        align-items: center;
+        display: flex;
+      }
+    }
+
+    .author {
+      padding: 3px 0;
+    }
+  }
+
+  .commit-header h3 {
+    flex-basis: auto !important;
+    margin-bottom: .5rem !important;
+  }
+
+  .commits-table {
+    flex-direction: column;
+
+    .commits-table-left {
+      align-items: initial !important;
+      margin-bottom: 6px;
+    }
+
+    .commits-table-right form {
+      display: flex;
+      flex-wrap: wrap;
+
+      > div:nth-child(1) {
+        order: 1;
+      }
+
+      > div:nth-child(2) {
+        order: 3;
+        margin-left: .5rem;
+        margin-top: .5rem;
+      }
+
+      > button:nth-child(3) {
+        order: 2;
+        margin-left: .25rem;
+      }
+    }
+  }
+
+  .commit-table {
+    overflow-x: scroll;
+
+    td.sha,
+    th.sha {
+      display: none !important;
+    }
+
+    .commit-list {
+      span.message-wrapper {
+        max-width: none;
+      }
+
+      tr td:last-child {
+        display: block;
+        width: max-content;
+      }
+
+      td.author {
+        display: block;
+        width: calc(100% + .5rem);
+      }
+
+      .copy-commit-sha {
+        display: none !important;
+      }
+    }
+  }
 }