diff --git a/app/views/registrations/new.mobile.haml b/app/views/registrations/new.mobile.haml
index 60b23c1f4..656770465 100644
--- a/app/views/registrations/new.mobile.haml
+++ b/app/views/registrations/new.mobile.haml
@@ -7,34 +7,36 @@
 .stream
   #login_form
     .login-container
-      %h2
-        = t('users.getting_started.welcome')
       = form_for(resource, :as => resource_name, :html => {:class => 'new_user_form'}, :url => registration_path(resource_name), :validate => true) do |f|
-        .row
-          .row
+        %fieldset
+          %legend
+            = t('welcome')
+
+          .control-group
             = f.label :username, t('username')
-          .centered
-            = f.text_field :username
-            %span.host_uri
-              = diaspora_id_host
-        .row
-          .row
-            = f.label :email, t('email')
-          .centered
-            = f.email_field :email
-        .row
-          .row
-            = f.label :password, t('password')
-          .centered
-            = f.password_field :password
-        .row
-          .row
-            = f.label :password_confirmation, t('password_confirmation')
-          .centered
-            = f.password_field :password_confirmation
-        .row
-          = f.submit t('registrations.new.create_my_account'), :class => 'login-submit'
-          = link_to t('.sign_up'), new_user_session_path()
+            .controls
+              = f.text_field :username
+              %span.host_uri
+                = diaspora_id_host
+
+            .control-group
+              = f.label :email, t('email')
+              .controls
+                = f.text_field :email
+
+            .control-group
+              = f.label :password, t('password')
+              .controls
+                = f.password_field :password
+ 
+            .control-group
+              = f.label :password_confirmation, t('password_confirmation')
+              .controls
+                = f.password_field :password_confirmation
+
+            .controls
+              = f.submit t('registrations.new.create_my_account'), :class => 'btn primary'
+              = link_to t('devise.sessions.new.sign_in'), new_user_session_path()
 
 %footer
-
+  = link_to t('layouts.application.toggle'), toggle_mobile_path
diff --git a/app/views/sessions/new.mobile.haml b/app/views/sessions/new.mobile.haml
index bedc7ecf7..59e588335 100644
--- a/app/views/sessions/new.mobile.haml
+++ b/app/views/sessions/new.mobile.haml
@@ -8,7 +8,7 @@
       = form_for(resource, :as => resource_name, :url => session_path(resource_name), :html => {:class => 'form-horizontal'}) do |f|
         %fieldset
           %legend
-            Log in
+            = t('devise.sessions.new.login')
           
           .control-group
             = f.label :username, t('username'), :class => "control-label"
@@ -26,8 +26,10 @@
             = f.submit t('devise.sessions.new.sign_in'), :class => 'btn primary'
 
 %footer
-  - if display_password_reset_link?
-    = link_to "Forgot Password?", new_password_path(resource_name)
-
   - if display_registration_link?    
-    = link_to t('.sign_up'), new_registration_path(resource_name)
+    = link_to t('devise.shared.links.sign_up'), new_registration_path(resource_name)
+
+  - if display_password_reset_link?
+    = link_to t('devise.passwords.new.forgot_password'), new_password_path(resource_name)
+
+  = link_to t('layouts.application.toggle'), toggle_mobile_path