diff --git a/assets/less/classes/forum/header.less b/assets/less/classes/forum/header.less
index 71e1dc4c..a11b76a2 100644
--- a/assets/less/classes/forum/header.less
+++ b/assets/less/classes/forum/header.less
@@ -1,19 +1,23 @@
 .forum__header {
     display: flex;
     flex-direction: column;
-    justify-content: flex-end;
-    padding: 10px 15px;
-    margin: 2px 0;
+    align-items: flex-start;
+    padding: 8px 10px;
 
     &__title {
         font-size: 2em;
         line-height: 1.5em;
         color: inherit;
         text-decoration: none;
+        padding: 0 5px;
 
         &[href]:hover {
             text-decoration: underline;
         }
+
+        &--fill {
+            width: 100%;
+        }
     }
 
     &__input {
@@ -31,11 +35,13 @@
         display: flex;
         font-size: 1.1em;
         line-height: 1.5em;
+        align-items: center;
     }
 
     &__breadcrumb {
         color: var(--accent-colour);
         text-decoration: none;
+        padding: 2px 5px;
 
         &:hover {
             text-decoration: underline;
@@ -43,7 +49,7 @@
 
         &__separator {
             color: var(--accent-colour);
-            margin: 0 8px;
+            margin: 0 4px;
             font-size: .9em;
         }
     }
@@ -53,14 +59,18 @@
     }
 
     &__action {
-        margin-right: 10px;
         color: inherit;
         text-decoration: none;
         transition: color .2s;
+        padding: 2px 5px;
 
         &:hover,
         &:focus {
             color: var(--accent-colour);
         }
+
+        &:not(:last-child) {
+            margin-right: 5px;
+        }
     }
 }
diff --git a/templates/forum/macros.twig b/templates/forum/macros.twig
index efaee511..a8c3afef 100644
--- a/templates/forum/macros.twig
+++ b/templates/forum/macros.twig
@@ -45,7 +45,7 @@
                     {{ title }}
                 </a>
             {% else %}
-                <div class="forum__header__title">
+                <div class="forum__header__title forum__header__title--fill">
                     {{ title }}
                 </div>
             {% endif %}