diff --git a/assets/less/classes/forum/categories.less b/assets/less/classes/forum/categories.less
new file mode 100644
index 00000000..c4cc0e15
--- /dev/null
+++ b/assets/less/classes/forum/categories.less
@@ -0,0 +1,18 @@
+.forum__categories {
+    margin-bottom: 2px;
+    box-sizing: content-box;
+    overflow: auto;
+
+    &__empty {
+        font-size: 1.2em;
+        line-height: 1.5em;
+        text-align: center;
+        padding: 10px;
+    }
+
+    &__list {
+        display: flex;
+        flex-direction: column;
+        margin: 5px;
+    }
+}
diff --git a/assets/less/main.less b/assets/less/main.less
index e0eb12c4..2ed0b4bc 100644
--- a/assets/less/main.less
+++ b/assets/less/main.less
@@ -113,6 +113,7 @@ body {
 
 // Forums
 @import "classes/forum/actions";
+@import "classes/forum/categories";
 @import "classes/forum/listing";
 @import "classes/forum/pagination";
 @import "classes/forum/post";
diff --git a/templates/forum/macros.twig b/templates/forum/macros.twig
index f2d6555f..6047a798 100644
--- a/templates/forum/macros.twig
+++ b/templates/forum/macros.twig
@@ -1,19 +1,20 @@
 {% macro forum_category_listing(forums, title) %}
     {% from _self import forum_category_entry %}
 
-    <div class="container forum__listing">
+    <div class="container container--new forum__categories">
         <div class="container__title">{{ title }}</div>
-        <div class="forum__listing__forums">
-            {% if forums|length > 0 %}
+
+        {% if forums|length > 0 %}
+            <div class="forum__categories__list">
                 {% for forum in forums %}
                     {{ forum_category_entry(forum) }}
                 {% endfor %}
-            {% else %}
-                <div class="forum__listing__none">
-                    This category is empty.
-                </div>
-            {% endif %}
-        </div>
+            </div>
+        {% else %}
+            <div class="forum__categories__empty">
+                This category is empty.
+            </div>
+        {% endif %}
     </div>
 {% endmacro %}