diff --git a/templates/custom/header.tmpl b/templates/custom/header.tmpl
index 9af436e..64f109f 100644
--- a/templates/custom/header.tmpl
+++ b/templates/custom/header.tmpl
@@ -58,9 +58,23 @@
     display: inline-block;
   }
 
-  .ui.user.list .ui.avatar {
+  /* Fix alignment and margin issues in avatars. */
+  .user.list img.avatar,
+  .comment-list .code-comment img.avatar,
+  .comment-list .comment img.avatar {
     vertical-align: unset !important;
-    margin-right: var(--spacer-2);
+  }
+
+  .user.list img.avatar,
+  .commit-list img.avatar,
+  .comment-list .code-comment img.avatar,
+  .comment-list .comment img.avatar,
+  .comment-list .timeline-item img.avatar {
+    margin-right: var(--spacer-2) !important;
+  }
+
+  .commit-list .author img.avatar {
+    margin-right: var(--spacer-3) !important;
   }
 
   /* Labels. e.g. issues count indicator in repo tabs. */
@@ -115,6 +129,10 @@
     max-width: 22px;
   }
 
+  .ui.table {
+    background: transparent;
+  }
+
   .repository .ui.table a {
     color: var(--color-text);
   }
@@ -123,6 +141,10 @@
     color: var(--color-primary);
   }
 
+  .repository .file-view .markup img {
+    border-radius: var(--border-radius);
+  }
+
   /* Repository folder icon. */
   .repository.file.list #repo-files-table tbody .svg.octicon-file-directory-fill {
     color: currentColor;