4 files changed, 32 insertions, 5 deletions
diff --git a/ui/app/account-detail.js b/ui/app/account-detail.js
index 2f412c5be..7a0d5b23b 100644
--- a/ui/app/account-detail.js
+++ b/ui/app/account-detail.js
@@ -99,8 +99,9 @@ AccountDetailScreen.prototype.render = function() {
             },
           }, [
 
-            // What is shown when not editing:
-            h('h2.font-medium.color-forest', identity && identity.name)
+            // What is shown when not editing + edit text:
+            h('label.editing-label',[h('.edit-text','edit')]),
+            h('h2.font-medium.color-forest', {title: 'edit'}, identity && identity.name)
           ]),
         ]),
 
diff --git a/ui/app/accounts/index.js b/ui/app/accounts/index.js
index 9cfab54e5..8215a559a 100644
--- a/ui/app/accounts/index.js
+++ b/ui/app/accounts/index.js
@@ -102,7 +102,7 @@ AccountsScreen.prototype.render = function() {
             alignItems: 'center',
           }
         }, [
-          h('i.fa.fa-chevron-down.fa-lg', {key: ''}),
+          h('i.fa.fa-plus.fa-lg', {key: ''}),
         ]),
       ]),
 
diff --git a/ui/app/components/editable-label.js b/ui/app/components/editable-label.js
index 20e24a9c7..c35f3261c 100644
--- a/ui/app/components/editable-label.js
+++ b/ui/app/components/editable-label.js
@@ -18,13 +18,13 @@ EditableLabel.prototype.render = function() {
   if (state && state.isEditingLabel) {
 
     return h('div.editable-label', [
-      h('input', {
+      h('input.editable-input', {
         defaultValue: props.textValue,
         onKeyPress:(event) => {
           this.saveIfEnter(event)
         },
       }),
-      h('button', {
+      h('button.editable-button', {
         onClick:() => this.saveText(),
       }, 'Save')
     ])
diff --git a/ui/app/css/index.css b/ui/app/css/index.css
index 4fd51ac95..2ee7c4094 100644
--- a/ui/app/css/index.css
+++ b/ui/app/css/index.css
@@ -223,6 +223,15 @@ app sections
   padding: 8px;*/
 }
 
+.editable-input{
+  font-size: 1em;
+  height: 31px;
+}
+
+.editable-button{
+  position: relative;
+  bottom: 2px;
+}
 /* Webkit */
 .unlock-screen input::-webkit-input-placeholder {
   text-align: center;
@@ -357,6 +366,23 @@ input.large-input {
 
 }
 
+.edit-text {
+  height: 15px;
+  visibility: hidden;
+}
+.editing-label {
+  cursor: text;
+  width: 60px;
+  height: 20px;
+  position: absolute;
+  text-align: right;
+  font-size: small;
+  padding-top: 15px;
+  color: #F7861C;
+}
+.editing-label:hover div{
+  visibility: visible;
+}
 /* tx confirm */
 
 .unconftx-section {