diff --git a/app/assets/images/cam-edit-user-avatar.png b/app/assets/images/cam-edit-user-avatar.png
new file mode 100644
index 000000000..bb72cee25
Binary files /dev/null and b/app/assets/images/cam-edit-user-avatar.png differ
diff --git a/app/assets/stylesheets/app/application/base.scss b/app/assets/stylesheets/app/application/base.scss
index 97a42d4a6..01680cc97 100644
--- a/app/assets/stylesheets/app/application/base.scss
+++ b/app/assets/stylesheets/app/application/base.scss
@@ -411,15 +411,6 @@ form {
     }
   }
 
-  .navbar-user-chip.open {
-    .navbar-user-toggle {
-      .border {
-        border: $m-logo-border-size solid $m-color-primary-soft;
-        border-radius: 50%;
-      }
-    }
-  }
-
   .navbar-user-chip {
     font-size: $m-font-mini;
     margin: ($m-navbar-height - $m-navbar-btn-size - $m-logo-border-size - $m-logo-border-size)/2 0;
@@ -432,17 +423,6 @@ form {
         background: $m-navbar-font-highlight;
       }
 
-      .border {
-        border: $m-logo-border-size solid $m-logo-border;
-        border-radius: 50%;
-        @include transition(all 0.2s ease-in-out);
-      }
-
-      .border:hover {
-        border: $m-logo-border-size solid $m-color-primary-soft;
-        border-radius: 50%;
-      }
-
       img, .logo-user {
         height: $m-navbar-btn-size;
         width: $m-navbar-btn-size;
@@ -450,11 +430,17 @@ form {
         display: inline-block;
         border: $m-logo-border-size solid $m-logo-border;
         font-size: $m-logo-font-size;
+        padding: 2px;
+        transition: border .2s ease-in;
 
         &.logo-initials {
           padding: $m-logo-initials-padding;
         }
       }
+
+      .logo-user:hover {
+        border: $m-logo-border-size solid $m-color-primary-soft;
+      }
     }
 
     .navbar-user-menu {
diff --git a/app/assets/stylesheets/app/users/show.scss b/app/assets/stylesheets/app/users/show.scss
index 29ef4e4d3..a290a4c37 100644
--- a/app/assets/stylesheets/app/users/show.scss
+++ b/app/assets/stylesheets/app/users/show.scss
@@ -30,15 +30,17 @@ body.users.update {
       font-weight: $m-font-weight-bold;
     }
 
-    @include logo-container;
+    .logo-image-container {
+      margin-top: -180px;
+      height: 250px;
+    }
+
     .logo-user {
       height: 250px;
       width: 250px;
-      float: none;
-      margin-top: -35%;
-      display: inline-block;
-      border: 1px solid $m-logo-border;
       border-radius: 50%;
+      border: 10px solid $m-logo-border;
+      margin: 0 auto;
 
       &.logo-initials {
         padding: 90px 0;
@@ -46,6 +48,28 @@ body.users.update {
       }
     }
 
+    .logo-image-controls {
+      height: 250px;
+      width: 250px;
+      background: rgba(10, 23, 55, 0.5);
+      border-radius: 50%;
+      position: absolute;
+      left: 0;
+      top: 0;
+      right: 0;
+      margin: 0 auto;
+      border: 10px solid $m-logo-border;
+    }
+
+    .logo-image-text  {
+      color: white;
+      margin-top: 65px;
+      img {
+        height: 85px;
+        width: 110px;
+      }
+    }
+
     .dropdown-toggle {
       background: none;
     }
diff --git a/app/helpers/logo_images_helper.rb b/app/helpers/logo_images_helper.rb
index fedbce3ba..b66154eda 100644
--- a/app/helpers/logo_images_helper.rb
+++ b/app/helpers/logo_images_helper.rb
@@ -41,13 +41,9 @@ def logo_image(resource, options={})
         elsif version_name == :logo336x256
           version_name = :logo168x128 unless resource.logo_image.send(version_name).file.exists?
         end
-        content_tag :div, class: 'border' do
-          concat image_tag(resource.logo_image_url(version_name), options)
-        end
+        image_tag(resource.logo_image_url(version_name), options)
       else
-        content_tag :div, class: 'border' do
-          concat logo_initials(resource, options)
-        end
+        logo_initials(resource, options)
       end
 
     # Try a gravatar image if we have a confirmed user
diff --git a/app/views/users/edit_data.html.haml b/app/views/users/edit_data.html.haml
index 23ab11720..8bb97c4e4 100644
--- a/app/views/users/edit_data.html.haml
+++ b/app/views/users/edit_data.html.haml
@@ -12,7 +12,11 @@
 #content-strip.container-fluid
   .dropdown
     .dropdown-toggle{ data: { toggle: 'dropdown' } }
-      = logo_image(@user, class: "logo-user")
+      .logo-image-container
+        = logo_image(@user, class: "logo-user")
+        .logo-image-controls
+          .logo-image-text
+            =image_tag("cam-edit-user-avatar.png")
     %ul.dropdown-menu.dropdown-menu-right
       %li= upload_logo_controls(@user)
       %li= link_to t('.remove_picture'), remove_logo_user_path(@user), method: "post"
diff --git a/app/views/users/show.html.haml b/app/views/users/show.html.haml
index aa8120597..b488bbf95 100644
--- a/app/views/users/show.html.haml
+++ b/app/views/users/show.html.haml
@@ -10,7 +10,8 @@
   = render :partial => 'users/menu'
 
 #content-strip.container-fluid
-  = logo_image(@user, class: "logo-user")
+  .logo-image-container
+    = logo_image(@user, class: "logo-user")
 
   .user-profile
     %span.name= @user.name