diff --git a/src-ui/src/app/components/app-frame/app-frame.component.html b/src-ui/src/app/components/app-frame/app-frame.component.html
index 235289074..b609a1c78 100644
--- a/src-ui/src/app/components/app-frame/app-frame.component.html
+++ b/src-ui/src/app/components/app-frame/app-frame.component.html
@@ -92,7 +92,7 @@
               <svg class="sidebaricon" fill="currentColor">
                 <use xlink:href="assets/bootstrap-icons.svg#file-text"/>
               </svg>&nbsp;{{d.title | documentTitle}}
-              <span class="close bg-light" (click)="closeDocument(d); $event.preventDefault()">
+              <span class="close" (click)="closeDocument(d); $event.preventDefault()">
                 <svg xmlns="http://www.w3.org/2000/svg" fill="currentColor" class="bi bi-x" viewBox="0 0 16 16">
                   <use xlink:href="assets/bootstrap-icons.svg#x"/>
                 </svg>
@@ -169,7 +169,7 @@
           </li>
           <li class="nav-item">
             <div class="d-flex w-100 flex-wrap">
-              <a class="nav-link pe-0 pb-0" target="_blank" rel="noopener noreferrer" href="https://github.com/paperless-ngx/paperless-ngx">
+              <a class="nav-link pe-2 pb-1" target="_blank" rel="noopener noreferrer" href="https://github.com/paperless-ngx/paperless-ngx">
                 <svg xmlns="http://www.w3.org/2000/svg" fill="currentColor" class="sidebaricon bi bi-github" viewBox="0 0 16 16">
                   <path d="M8 0C3.58 0 0 3.58 0 8c0 3.54 2.29 6.53 5.47 7.59.4.07.55-.17.55-.38 0-.19-.01-.82-.01-1.49-2.01.37-2.53-.49-2.69-.94-.09-.23-.48-.94-.82-1.13-.28-.15-.68-.52-.01-.53.63-.01 1.08.58 1.23.82.72 1.21 1.87.87 2.33.66.07-.52.28-.87.51-1.07-1.78-.2-3.64-.89-3.64-3.95 0-.87.31-1.59.82-2.15-.08-.2-.36-1.02.08-2.12 0 0 .67-.21 2.2.82.64-.18 1.32-.27 2-.27.68 0 1.36.09 2 .27 1.53-1.04 2.2-.82 2.2-.82.44 1.1.16 1.92.08 2.12.51.56.82 1.27.82 2.15 0 3.07-1.87 3.75-3.65 3.95.29.25.54.73.54 1.48 0 1.07-.01 1.93-.01 2.2 0 .21.15.46.55.38A8.012 8.012 0 0 0 16 8c0-4.42-3.58-8-8-8z"/>
                 </svg>&nbsp;<ng-container i18n>GitHub</ng-container>
diff --git a/src-ui/src/theme.scss b/src-ui/src/theme.scss
index f74ea925c..9b6f1f945 100644
--- a/src-ui/src/theme.scss
+++ b/src-ui/src/theme.scss
@@ -62,6 +62,7 @@ svg.logo {
 }
 
 .btn:focus,
+.btn:active:focus,
 .dropdown-item:focus,
 .btn-check:focus + .btn,
 .form-control:focus,
@@ -70,6 +71,16 @@ svg.logo {
   box-shadow: 0 0 0 0.25rem hsla(var(--ngx-green), var(--l), 0.7);
 }
 
+.nav-link:focus-visible, .nav-item a:focus-visible {
+  outline: none;
+  background-color: var(--ngx-bg-darker);
+}
+
+a.navbar-brand:focus-visible {
+  outline: none;
+  color: var(--ngx-primary-darken-10);
+}
+
 .dropdown.show {
   > .btn-primary {
     background-color: var(--bs-primary);
@@ -138,6 +149,14 @@ textarea,
       color: var(--bs-body-color);
       border-bottom: 1px solid transparent;
     }
+
+    &:focus {
+      border-color: var(--bs-border-color);
+    }
+
+    &.active:focus {
+      border-bottom: 1px solid transparent;
+    }
   }
 }