diff --git a/app/views/devise/_omniauth_form.html.erb b/app/views/devise/_omniauth_form.html.erb
index 5a9cca608..328a1ef1e 100644
--- a/app/views/devise/_omniauth_form.html.erb
+++ b/app/views/devise/_omniauth_form.html.erb
@@ -3,13 +3,13 @@
   <% if current_page?(new_user_session_path) %>
     <div class="row">
       <div class="small-12 column">
-        <div class="margin">
+        <div class="margin-bottom text-center">
           <strong><%= t("omniauth.info_sign_in") %></strong>
         </div>
       </div>
 
       <% if feature? :twitter_login %>
-        <div class="small-12 medium-4 column end">
+        <div class="small-12 medium-6 large-4 column end">
           <%= link_to t("omniauth.twitter.name"), user_omniauth_authorize_path(:twitter),
                       title: t("omniauth.twitter.sign_in"),
                       class: "button-twitter button expanded" %>
@@ -17,7 +17,7 @@
       <% end %>
 
       <% if feature? :facebook_login %>
-        <div class="small-12 medium-4 column end">
+        <div class="small-12 medium-6 large-4 column end">
           <%= link_to t("omniauth.facebook.name"), user_omniauth_authorize_path(:facebook),
                       title: t("omniauth.facebook.sign_in"),
                       class: "button-facebook button expanded" %>
@@ -25,7 +25,7 @@
       <% end %>
 
       <% if feature? :google_login %>
-        <div class="small-12 medium-4 column end">
+        <div class="small-12 medium-6 large-4 column end">
           <%= link_to t("omniauth.google_oauth2.name"), user_omniauth_authorize_path(:google_oauth2),
                       title: t("omniauth.google_oauth2.sign_in"),
                       class: "button-google button expanded" %>
@@ -40,11 +40,13 @@
   <% elsif current_page?(new_user_registration_path) %>
     <div class="row">
       <div class="small-12 column">
-        <p><%= t("omniauth.info_sign_up") %></p>
+        <div class="margin-bottom text-center">
+          <strong><%= t("omniauth.info_sign_up") %></strong>
+        </div>
       </div>
 
       <% if feature? :twitter_login %>
-        <div class="small-12 medium-4 column end">
+        <div class="small-12 medium-6 large-4 column end">
           <%= link_to t("omniauth.twitter.name"), user_omniauth_authorize_path(:twitter),
                       title: t("omniauth.twitter.sign_up"),
                       class: "button-twitter button expanded" %>
@@ -52,7 +54,7 @@
       <% end %>
 
       <% if feature? :facebook_login %>
-        <div class="small-12 medium-4 column end">
+        <div class="small-12 medium-6 large-4 column end">
           <%= link_to t("omniauth.facebook.name"), user_omniauth_authorize_path(:facebook),
                       title: t("omniauth.facebook.sign_up"),
                       class: "button-facebook button expanded" %>
@@ -60,15 +62,17 @@
       <% end %>
 
       <% if feature? :google_login %>
-        <div class="small-12 medium-4 column end">
+        <div class="small-12 medium-6 large-4 column end">
           <%= link_to t("omniauth.google_oauth2.name"), user_omniauth_authorize_path(:google_oauth2),
                       title: t("omniauth.google_oauth2.sign_up"),
                       class: "button-google button expanded" %>
         </div>
       <% end %>
-    </div>
 
-    <hr/>
+      <div class="small-12 column auth-divider">
+        <span><%= t("omniauth.or_fill") %></span>
+      </div>
+    </div>
   <% end %>
 
 <% end %>
diff --git a/app/views/devise/confirmations/new.html.erb b/app/views/devise/confirmations/new.html.erb
index 88016f5ce..fe2cf0dc5 100644
--- a/app/views/devise/confirmations/new.html.erb
+++ b/app/views/devise/confirmations/new.html.erb
@@ -15,7 +15,9 @@
 
       <%= hidden_field_tag :confirmation_token,@confirmation_token %>
 
-      <%= f.submit(t("devise_views.confirmations.new.submit"), class: "button expanded") %>
+      <div class="small-12 medium-6 small-centered">
+        <%= f.submit(t("devise_views.confirmations.new.submit"), class: "button expanded") %>
+      </div>
     </div>
 <% end %>
 
diff --git a/app/views/devise/passwords/new.html.erb b/app/views/devise/passwords/new.html.erb
index 59608c148..72dd70fb9 100644
--- a/app/views/devise/passwords/new.html.erb
+++ b/app/views/devise/passwords/new.html.erb
@@ -7,7 +7,9 @@
     <div class="small-12 column">
       <%= f.email_field :email, autofocus: true, placeholder: t("devise_views.passwords.new.email_label") %>
 
-      <%= f.submit t("devise_views.passwords.new.send_submit"), class: "button expanded" %>
+      <div class="small-12 medium-6 small-centered">
+        <%= f.submit t("devise_views.passwords.new.send_submit"), class: "button expanded" %>
+      </div>
     </div>
 <% end %>
 
diff --git a/app/views/devise/sessions/new.html.erb b/app/views/devise/sessions/new.html.erb
index 2abd9aebd..ad375e772 100644
--- a/app/views/devise/sessions/new.html.erb
+++ b/app/views/devise/sessions/new.html.erb
@@ -10,17 +10,17 @@
 
 <%= form_for(resource, as: resource_name, url: session_path(resource_name)) do |f| %>
   <div class="row">
-    <div class="small-12 columns">
+    <div class="small-12 column">
       <%= f.email_field :email, autofocus: true, placeholder: t("devise_views.sessions.new.email_label"), tabindex: "1" %>
     </div>
 
-    <div class="small-12 columns">
+    <div class="small-12 column">
       <%= link_to t("devise_views.shared.links.new_password"), new_password_path(resource_name), class: "float-right", tabindex: "3" %>
       <%= f.password_field :password, autocomplete: "off", placeholder: t("devise_views.sessions.new.password_label"), tabindex: "2" %>
     </div>
 
     <% if devise_mapping.rememberable? -%>
-      <div class="small-12 columns">
+      <div class="small-12 column">
         <%= f.label :remember_me do %>
           <%= f.check_box :remember_me, title: t('devise_views.sessions.new.remember_me'), label: false, tabindex: "4" %>
           <span class="checkbox"><%= t("devise_views.sessions.new.remember_me") %></span>
@@ -28,7 +28,7 @@
       </div>
     <% end -%>
 
-    <div class="small-12 columns">
+    <div class="small-12 medium-6 small-centered">
       <%= f.submit(t("devise_views.sessions.new.submit"), class: "button expanded") %>
     </div>
   </div>
diff --git a/app/views/layouts/devise.html.erb b/app/views/layouts/devise.html.erb
index f7e1a820e..a0e9eaaff 100644
--- a/app/views/layouts/devise.html.erb
+++ b/app/views/layouts/devise.html.erb
@@ -25,7 +25,7 @@
 
       <div class="small-12 medium-9 column">
         <div class="row">
-          <div class="small-12 medium-6 small-centered column">
+          <div class="small-12 medium-9 large-7 small-centered column">
             <div class="auth-form margin">
               <%= render 'layouts/flash' %>
 
diff --git a/app/views/organizations/registrations/new.html.erb b/app/views/organizations/registrations/new.html.erb
index 3b1763e83..e85bb5408 100644
--- a/app/views/organizations/registrations/new.html.erb
+++ b/app/views/organizations/registrations/new.html.erb
@@ -33,8 +33,9 @@
               terms: link_to(t("devise_views.users.registrations.new.terms_link"), "/conditions", title: t('shared.target_blank_html'), target: "_blank")).html_safe %></span>
       <% end %>
 
-
-      <%= f.submit t("devise_views.organizations.registrations.new.submit"), class: "button expanded" %>
+      <div class="small-12 medium-6 small-centered">
+        <%= f.submit t("devise_views.organizations.registrations.new.submit"), class: "button expanded" %>
+      </div>
     </div>
   </div>
 <% end %>
diff --git a/app/views/users/registrations/new.html.erb b/app/views/users/registrations/new.html.erb
index f2f1827ba..1c6f81455 100644
--- a/app/views/users/registrations/new.html.erb
+++ b/app/views/users/registrations/new.html.erb
@@ -46,8 +46,9 @@
               target: "_blank")).html_safe %>
         </span>
       <% end %>
-
-      <%= f.submit t("devise_views.users.registrations.new.submit"), class: "button expanded" %>
+      <div class="small-12 medium-6 small-centered">
+        <%= f.submit t("devise_views.users.registrations.new.submit"), class: "button expanded" %>
+      </div>
     </div>
   </div>
 <% end %>