diff --git a/src/templates/layout.pug b/src/templates/layout.pug
index a9f2363..a1de43d 100644
--- a/src/templates/layout.pug
+++ b/src/templates/layout.pug
@@ -199,23 +199,18 @@ html(lang="en")
 							span Services
 					| {% endblock navigation_sections %}
 
+					| {% block navigation_user %}
+					| {% include 'menus/notifications.html' %}
+					| {% include 'menus/user.html' %}
+					| {% endblock navigation_user %}
 
 					| {% if current_user.is_anonymous %}
-					li
-						a.navbar-item(
+					li.pt-1
+						a.btn.btn-sm.btn-primary.px-3.mx-1(
 							href="https://store.blender.org/product/membership/",
 							title="Sign up") Sign up
 					| {% endif %}
 
-
-					| {% block navigation_user %}
-
-					| {% include 'menus/notifications.html' %}
-					| {% include 'menus/user.html' %}
-
-					| {% endblock navigation_user %}
-
-
 		.page-content
 			#search-overlay
 			| {% block page_overlay %}
diff --git a/src/templates/users/settings/billing.pug b/src/templates/users/settings/billing.pug
index befe663..2c50f16 100644
--- a/src/templates/users/settings/billing.pug
+++ b/src/templates/users/settings/billing.pug
@@ -65,7 +65,7 @@ p Your organisation provides you with your subscription.
 
 hr
 p
-	button#recheck_subscription.btn.btn-default(onclick="javascript:recheck_subscription(this)") Re-check my subscription
+	button#recheck_subscription.btn.btn-outline-secondary(onclick="javascript:recheck_subscription(this)") Re-check my subscription
 
 hr
 
diff --git a/src/templates/users/settings/emails.pug b/src/templates/users/settings/emails.pug
index 2411997..cf91972 100644
--- a/src/templates/users/settings/emails.pug
+++ b/src/templates/users/settings/emails.pug
@@ -11,7 +11,7 @@
 		| {% endfor %}
 
 		.buttons
-			button.btn.btn-default.button-submit(type='submit')
+			button.btn.btn-outline-success.button-submit(type='submit')
 				i.pi-check
 				| Save Changes
 | {% endblock %}