diff --git a/src/vs/base/browser/ui/hover/hoverWidget.css b/src/vs/base/browser/ui/hover/hoverWidget.css
index 11f1fdccc7c09..c72d155223214 100644
--- a/src/vs/base/browser/ui/hover/hoverWidget.css
+++ b/src/vs/base/browser/ui/hover/hoverWidget.css
@@ -48,7 +48,7 @@
 .monaco-hover h4,
 .monaco-hover h5,
 .monaco-hover h6 {
-	margin: 8px 0;
+	margin: 4px 0;
 }
 
 .monaco-hover h1,
@@ -68,20 +68,33 @@
 	box-sizing: border-box;
 	border-left: 0px;
 	border-right: 0px;
-	margin-top: 4px;
-	margin-bottom: -4px;
+	margin-top: 0px;
+	margin-bottom: 0px;
 	margin-left: -8px;
 	margin-right: -8px;
 	height: 1px;
 }
 
-.monaco-hover p:first-child,
 .monaco-hover .code:first-child,
 .monaco-hover ul:first-child {
 	margin-top: 0;
 }
 
-.monaco-hover p:last-child,
+.monaco-hover p:first-child {
+	margin-top: 4px;
+	display: flex;
+	align-items: center;
+}
+
+.monaco-hover p:first-child img {
+	border-radius: 50%;
+	margin-right: 4px;
+}
+
+.monaco-hover p:last-child {
+	margin-bottom: 2px;
+}
+
 .monaco-hover .code:last-child,
 .monaco-hover ul:last-child {
 	margin-bottom: 0;
@@ -199,7 +212,8 @@
  * https://github.com/microsoft/vscode/issues/221359
  */
 .monaco-hover .markdown-hover .hover-contents:not(.code-hover-contents):not(.html-hover-contents) span.codicon {
-	margin-bottom: 2px;
+	/* margin-bottom: 2px; */
+	margin-right: 4px;
 }
 
 .monaco-hover-content .action-container a {
diff --git a/src/vs/platform/hover/browser/hover.css b/src/vs/platform/hover/browser/hover.css
index 597738d306964..5a5787c21e088 100644
--- a/src/vs/platform/hover/browser/hover.css
+++ b/src/vs/platform/hover/browser/hover.css
@@ -8,7 +8,6 @@
 .monaco-hover.workbench-hover {
 	position: relative;
 	font-size: 13px;
-	line-height: 19px;
 	/* Must be higher than sash's z-index and terminal canvases */
 	z-index: 40;
 	overflow: hidden;
@@ -34,6 +33,25 @@
 	font-size: 12px;
 }
 
+.monaco-hover.workbench-hover.compact .codicon,
+.monaco-hover.monaco-hover-content .code-hover-contents {
+	font-size: 16px;
+}
+
+/* Increase codicon size in hover content paragraphs - use !important to override inline styles */
+.monaco-hover .monaco-hover-content p .codicon {
+	font-size: 16px !important;
+}
+
+.monaco-hover .monaco-hover-content p:last-child {
+	display: flex;
+}
+
+.monaco-hover .monaco-hover-content p:last-child a {
+	display: inline-flex;
+	gap: 2px;
+}
+
 .monaco-hover.workbench-hover.compact .monaco-action-bar .action-item .codicon {
 	/* Given our font-size, adjust action icons accordingly */
 	width: 12px;
diff --git a/src/vs/workbench/contrib/scm/browser/media/scm.css b/src/vs/workbench/contrib/scm/browser/media/scm.css
index f70be633c6c96..298e16777db3b 100644
--- a/src/vs/workbench/contrib/scm/browser/media/scm.css
+++ b/src/vs/workbench/contrib/scm/browser/media/scm.css
@@ -591,18 +591,6 @@
 
 /* History item hover */
 
-.monaco-hover.history-item-hover p:first-child {
-	margin-top: 4px;
-}
-
-.monaco-hover.history-item-hover p:last-child {
-	margin-bottom: 2px !important;
-}
-
-.monaco-hover.history-item-hover p:last-child span:not(.codicon) {
-	padding: 2px 0;
-}
-
 .monaco-hover.history-item-hover hr {
 	margin-top: 4px;
 	margin-bottom: 4px;