diff --git a/app/assets/images/user_default_big.jpg b/app/assets/images/user_default_big.jpg
new file mode 100644
index 000000000..d1c5bcea2
Binary files /dev/null and b/app/assets/images/user_default_big.jpg differ
diff --git a/app/assets/stylesheets/participacion.scss b/app/assets/stylesheets/participacion.scss
index 7469007b3..2b9cfd983 100644
--- a/app/assets/stylesheets/participacion.scss
+++ b/app/assets/stylesheets/participacion.scss
@@ -370,12 +370,16 @@ form {
     line-height: $line-height;
   }
 
-  input[type]:not([type=submit]) {
+  input[type]:not([type=submit]):not([type=file]) {
     background: $input-bg;
     height: $line-height*2;
     margin-bottom: rem-calc(16);
   }
 
+  input[type=file] {
+    margin: rem-calc(12) 0;
+  }
+
   .note {
     display: block;
     font-size: rem-calc(13);
@@ -390,6 +394,7 @@ form {
   .checkbox {
     display: inline-block;
     font-size: rem-calc(14);
+    font-weight: normal;
     line-height: $line-height*2;
     margin: 0 0 0 rem-calc(6);
     vertical-align: top;
diff --git a/app/views/account/show.html.erb b/app/views/account/show.html.erb
index 6a2d6d416..6d1f4d9cd 100644
--- a/app/views/account/show.html.erb
+++ b/app/views/account/show.html.erb
@@ -1,6 +1,8 @@
 <div class="row account">
-  <div class="small-12 medium-9 column">
-    <h1><%= t("account.show.title") %></h1>
+  <div class="small-12 column">
+    <%= link_to t("account.show.change_credentials_link"), edit_user_registration_path, class: 'button radius small secondary right' %>
+
+    <h1 class="inline-block"><%= t("account.show.title") %></h1>
 
     <%= form_for @account, as: :account, url: account_path do |f| %>
 
@@ -17,16 +19,13 @@
 
       <div class="row">
         <div class="small-12 medium-6 column">
+          <h2><%= t("account.show.personal")%></h2>
           <%= f.label :first_name, t("account.show.first_name_label") %>
           <%= f.text_field :first_name, placeholder: t("account.show.first_name_label") %>
-        </div>
 
-        <div class="small-12 medium-6 column">
           <%= f.label :last_name, t("account.show.last_name_label") %>
           <%= f.text_field :last_name, placeholder:  t("account.show.last_name_label") %>
-        </div>
 
-        <div class="small-12 medium-6 column">
           <%= f.label :nickname, t("account.show.nickname_label") %>
           <%= f.text_field :nickname, placeholder: t("account.show.nickname_label") %>
           <%= f.label :use_nickname do %>
@@ -44,9 +43,6 @@
             <%= f.check_box :email_on_debate_comment %>
             <span class="checkbox"><%= t("account.show.email_on_debate_comment_label") %></span>
           <% end %>
-        </div>
-
-        <div class="small-12 column">
           <%= f.label :email_on_comment_reply do %>
             <%= f.check_box :email_on_comment_reply %>
             <span class="checkbox"><%= t("account.show.email_on_comment_reply_label") %></span>
@@ -59,8 +55,4 @@
       </div>
     <% end %>
   </div>
-
-  <div class="small-12 medium-3 column text-center">
-    <%= link_to t("account.show.change_credentials_link"), edit_user_registration_path, class: 'button radius small secondary' %>
-  </div>
-</div>
+</div>
\ No newline at end of file
diff --git a/app/views/devise/registrations/edit.html.erb b/app/views/devise/registrations/edit.html.erb
index b670b6776..8f328c230 100644
--- a/app/views/devise/registrations/edit.html.erb
+++ b/app/views/devise/registrations/edit.html.erb
@@ -1,5 +1,5 @@
 <div class="row">
-  <div class="account small-12 medium-9 column small-centered">
+  <div class="account small-12 medium-5 column small-centered">
 
     <i class="icon-angle-left left"></i>&nbsp;<%= link_to t("devise_views.registrations.edit.back_link"), :back, class: "left back" %>
 
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 2451745c9..b036f8125 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -71,10 +71,13 @@ en:
       email_on_debate_comment_label: "Receive email when someone comments on my debates"
       email_on_comment_reply_label: "Receive email when someone replies to my comments"
       change_credentials_link: "Change my credentials"
+      avatar: "Avatar"
+      personal: "Personal data"
       first_name_label: "First Name"
       last_name_label: "Last Name"
       use_nickname_label: "Use nickname"
       nickname_label: "Nickname"
+      notifications: Notifications
   simple_captcha:
     placeholder: "Enter the image value"
     label: "Enter the code in the box:"
diff --git a/config/locales/es.yml b/config/locales/es.yml
index da7fe8303..7995483d4 100644
--- a/config/locales/es.yml
+++ b/config/locales/es.yml
@@ -71,10 +71,13 @@ es:
       change_credentials_link: "Cambiar mis credenciales"
       email_on_debate_comment_label: "Recibir un email cuando alguien comenta en mis debates"
       email_on_comment_reply_label: "Recibir un email cuando alguien contesta a mis comentarios"
+      avatar: "Avatar"
+      personal: "Datos personales"
       first_name_label: "Nombre"
       last_name_label: "Apellidos"
       use_nickname_label: "Usar pseudónimo"
       nickname_label: "Pseudónimo"
+      notifications: Notificaciones
   simple_captcha:
     placeholder: "Introduce el texto de la imagen"
     label: "Introduce el texto en la caja:"