diff --git a/app/assets/javascripts/app/views/profile/language.jst.eco b/app/assets/javascripts/app/views/profile/language.jst.eco
index 6e4f57138..0f89cda4d 100644
--- a/app/assets/javascripts/app/views/profile/language.jst.eco
+++ b/app/assets/javascripts/app/views/profile/language.jst.eco
@@ -1,6 +1,8 @@
 <form class="form-normal">
   <h2><%- @T( 'Language' ) %></h2>
   <p><%- @T( 'Change your language.' ) %></p>
-  <div class="language_item"></div>
-  <button type="submit" class="btn"><%- @T( 'Submit' ) %></button>
+  <div class="settings-entry horizontal end">
+    <div class="form-item language_item flex"></div>
+    <button type="submit" class="btn btn--primary"><%- @T( 'Submit' ) %></button>
+  </div>
 </form>
diff --git a/app/assets/javascripts/app/views/profile/password.jst.eco b/app/assets/javascripts/app/views/profile/password.jst.eco
index 5fcdb089d..e9958ad4a 100644
--- a/app/assets/javascripts/app/views/profile/password.jst.eco
+++ b/app/assets/javascripts/app/views/profile/password.jst.eco
@@ -1,5 +1,5 @@
 <h2><%- @T( 'Change your password' ) %></h2>
-<form class="form-normal">
+<form class="settings-entry">
   <div class="password_item"></div>
-  <button type="submit" class="btn"><%- @T( 'Submit' ) %></button>
+  <button type="submit" class="btn btn--primary"><%- @T( 'Submit' ) %></button>
 </form>