6 files changed, 18 insertions, 9 deletions
diff --git a/web-ui/app/locales/en_US/translation.json b/web-ui/app/locales/en_US/translation.json
index cd54ddf7..3e006156 100644
--- a/web-ui/app/locales/en_US/translation.json
+++ b/web-ui/app/locales/en_US/translation.json
@@ -44,7 +44,7 @@
     "search-results-for": "Search results for",
     "forward": "Forward",
     "feedback-placeholder": "Tell us what you liked, didn't like, what is missing and generally what you think about Pixelated.",
-    "user-settings": "User Settings",
+    "user-account": "My Account",
     "email-address": "Email address",
     "public-key-fingerprint": "Public key fingerprint",
     "version": "version",
diff --git a/web-ui/app/locales/pt_BR/translation.json b/web-ui/app/locales/pt_BR/translation.json
index 1e185595..ff766a2b 100644
--- a/web-ui/app/locales/pt_BR/translation.json
+++ b/web-ui/app/locales/pt_BR/translation.json
@@ -44,7 +44,7 @@
     "search-results-for": "Resultado da pesquisa por",
     "forward": "Encaminhar",
     "feedback-placeholder": "Nos diga o que gosta, não gosta, o que está faltando e o que pensa sobre o Pixelated.",
-    "user-settings": "Opções de usuário",
+    "user-account": "Opções de usuário",
     "email-address": "Endereço de email",
     "public-key-fingerprint": "Identificação da chave pública",
     "version": "versão",
diff --git a/web-ui/app/scss/views/_mail-list.scss b/web-ui/app/scss/views/_mail-list.scss
index 417fabc2..66bcabbe 100644
--- a/web-ui/app/scss/views/_mail-list.scss
+++ b/web-ui/app/scss/views/_mail-list.scss
@@ -1,10 +1,8 @@
 .mail-list-entry {
     @include scut-clearfix;
 
-    padding: 8px 10px 10px 10px;
     border-bottom: 1px solid white;
     transition: background-color 150ms ease-out;
-    cursor: pointer;
     font-weight: bold;
     height: 80px;
     position: relative;
@@ -32,7 +30,10 @@
         margin-right: 5px;
         display: block;
         float: left;
-        min-height: 100%;
+        margin: {
+          top: 8px;
+          left: 20px;
+        }
 
         & > input[type=checkbox] {
             @include check-box;
@@ -42,7 +43,8 @@
     &__item {
         display: block;
         color: $dark_grey;
-        padding-left: 24px;
+        padding: 8px 10px 10px 34px;
+        height: 100%;
 
         &-from {
             white-space: nowrap;
diff --git a/web-ui/app/scss/views/_navigation.scss b/web-ui/app/scss/views/_navigation.scss
index eaf188d6..2c33a791 100644
--- a/web-ui/app/scss/views/_navigation.scss
+++ b/web-ui/app/scss/views/_navigation.scss
@@ -143,6 +143,13 @@
     left: 0;
     top: 0;
     position: relative;
+
+    .fa-navicon {
+        font-size: 24px;
+        &:before {
+            margin-left: -5px;
+        }
+    }
 }
 
 .left-off-canvas-logo {
diff --git a/web-ui/app/templates/page/user_settings_box.hbs b/web-ui/app/templates/page/user_settings_box.hbs
index 962d0a69..2152b779 100644
--- a/web-ui/app/templates/page/user_settings_box.hbs
+++ b/web-ui/app/templates/page/user_settings_box.hbs
@@ -1,7 +1,7 @@
 <header>
   <span id="user-settings-close"><i class="fa fa-close"></i></span>
    <i class="fa fa-user"></i>
-   <h1>{{t 'user-settings'}}</h1>
+   <h1>{{t 'user-account'}}</h1>
    <i class="shortcut-label"></i>
 </header>
 <i class="fa fa-envelope-o"></i><h2>{{t 'email-address'}}</h2>
diff --git a/web-ui/app/templates/page/user_settings_icon.hbs b/web-ui/app/templates/page/user_settings_icon.hbs
index d689a2f8..8f2f9215 100644
--- a/web-ui/app/templates/page/user_settings_icon.hbs
+++ b/web-ui/app/templates/page/user_settings_icon.hbs
@@ -1,8 +1,8 @@
 <ul id="user-settings-icon">
-  <a title="user settings" href='#'>
+  <a title="my account" href='#'>
     <li>
       <div class="fa fa-user"></div>
-      <i class="shortcut-label"></i> {{t 'user-settings'}}
+      <i class="shortcut-label"></i> {{t 'user-account'}}
     </li>
   </a>
 </ul>