diff --git a/app/templates/common/topnav.html b/app/templates/common/topnav.html
index ce4d21c..fd1b761 100644
--- a/app/templates/common/topnav.html
+++ b/app/templates/common/topnav.html
@@ -12,7 +12,7 @@
   {% else %}
     {% with user = get_active_user() %}
       Welcome, <a href="{{ url_for("users.page", username = user.username) }}">{{user.username}}</a>
-      <ul>
+      <ul class="horizontal">
         <li><a href="{{ url_for("users.settings", username = user.username) }}">Settings</a></li>
         <li><a href="{{ url_for("users.inbox", username = user.username) }}">Inbox</a></li>
         {% if config.DISABLE_SIGNUP and user.can_invite() %}
diff --git a/data/static/css/style.css b/data/static/css/style.css
index ecc998f..68b571b 100644
--- a/data/static/css/style.css
+++ b/data/static/css/style.css
@@ -64,13 +64,6 @@ a:visited {
   justify-content: space-between;
   align-items: baseline;
 }
-#topnav ul {
-  display: inline;
-  margin-left: 0;
-}
-#topnav ul li {
-  display: inline list-item;
-}
 
 #bottomnav {
   padding: 10px;
@@ -1163,6 +1156,14 @@ ul, ol {
   padding: 0;
 }
 
+ul.horizontal, ol.horizontal {
+  display: inline;
+  margin-left: 0;
+}
+ul.horizontal li, ol.horizontal li {
+  display: inline list-item;
+}
+
 .new-concept-notification.hidden {
   display: none;
 }
diff --git a/data/static/css/theme-otomotone.css b/data/static/css/theme-otomotone.css
index dcccd85..78732ab 100644
--- a/data/static/css/theme-otomotone.css
+++ b/data/static/css/theme-otomotone.css
@@ -64,13 +64,6 @@ a:visited {
   justify-content: space-between;
   align-items: baseline;
 }
-#topnav ul {
-  display: inline;
-  margin-left: 0;
-}
-#topnav ul li {
-  display: inline list-item;
-}
 
 #bottomnav {
   padding: 10px;
@@ -1163,6 +1156,14 @@ ul, ol {
   padding: 0;
 }
 
+ul.horizontal, ol.horizontal {
+  display: inline;
+  margin-left: 0;
+}
+ul.horizontal li, ol.horizontal li {
+  display: inline list-item;
+}
+
 .new-concept-notification.hidden {
   display: none;
 }
diff --git a/data/static/css/theme-peachy.css b/data/static/css/theme-peachy.css
index af5c3c4..25aa03b 100644
--- a/data/static/css/theme-peachy.css
+++ b/data/static/css/theme-peachy.css
@@ -64,13 +64,6 @@ a:visited {
   justify-content: space-between;
   align-items: baseline;
 }
-#topnav ul {
-  display: inline;
-  margin-left: 0;
-}
-#topnav ul li {
-  display: inline list-item;
-}
 
 #bottomnav {
   padding: 6px;
@@ -1163,6 +1156,14 @@ ul, ol {
   padding: 0;
 }
 
+ul.horizontal, ol.horizontal {
+  display: inline;
+  margin-left: 0;
+}
+ul.horizontal li, ol.horizontal li {
+  display: inline list-item;
+}
+
 .new-concept-notification.hidden {
   display: none;
 }
diff --git a/sass/_default.scss b/sass/_default.scss
index 3af0393..4201c6d 100644
--- a/sass/_default.scss
+++ b/sass/_default.scss
@@ -177,20 +177,10 @@ a{
 }
 
 $topnav_color: $ACCENT_COLOR !default;
-$topnav_list_margin_left: 0 !default;
 #topnav {
   @include navbar($topnav_color);
   justify-content: space-between;
   align-items: baseline;
-
-  & ul {
-    display: inline;
-    margin-left: $topnav_list_margin_left;
-  }
-
-  & ul li {
-    display: inline list-item;
-  }
 }
 
 $bottomnav_color: $DARK_1 !default;
@@ -1083,6 +1073,16 @@ ul, ol {
   padding: $list_padding;
 }
 
+$horizontal_list_margin_left: 0 !default;
+ul.horizontal, ol.horizontal {
+  display: inline;
+  margin-left: $horizontal_list_margin_left;
+  & li {
+    display: inline list-item;
+  }
+}
+
+
 .new-concept-notification.hidden {
   display: none;
 }