Merge branch 'master' of github.com:MetaMask/metamask-plugin

5 files changed, 7 insertions, 5 deletions

diff --git a/ui/app/account-detail.js b/ui/app/account-detail.js
index 276824459..695a1a3f9 100644
--- a/ui/app/account-detail.js
+++ b/ui/app/account-detail.js
@@ -107,6 +107,7 @@ AccountDetailScreen.prototype.render = function () {
 
           h('img.cursor-pointer.color-orange', {
             src: 'images/copy.svg',
+            title: 'Copy Address',
             onClick: () => copyToClipboard(ethUtil.toChecksumAddress(selected)),
             style: {
               margin: '0px 5px',
@@ -115,6 +116,7 @@ AccountDetailScreen.prototype.render = function () {
 
           h('img.cursor-pointer.color-orange', {
             src: 'images/key-32.png',
+            title: 'Export Private Key',
             onClick: () => this.requestAccountExport(selected),
             style: {
               margin: '0px 5px',
diff --git a/ui/app/accounts/account-list-item.js b/ui/app/accounts/account-list-item.js
index b42de182e..6bba6e145 100644
--- a/ui/app/accounts/account-list-item.js
+++ b/ui/app/accounts/account-list-item.js
@@ -62,6 +62,7 @@ NewComponent.prototype.render = function () {
         },
       }, [
         h('img.cursor-pointer.color-orange', {
+          title: 'Copy Address',
           src: 'images/copy.svg',
           onClick: (event) => {
             event.stopPropagation()
diff --git a/ui/app/app.js b/ui/app/app.js
index a07118ddb..8a51f968b 100644
--- a/ui/app/app.js
+++ b/ui/app/app.js
@@ -157,6 +157,7 @@ App.prototype.renderAppBar = function () {
               width: '23.5px',
               marginRight: '8px',
             },
+            title: 'Switch Accounts',
             onClick: (event) => {
               event.stopPropagation()
               this.props.dispatch(actions.showAccountsPage())
diff --git a/ui/app/css/index.css b/ui/app/css/index.css
index f0e7dc794..24497a66f 100644
--- a/ui/app/css/index.css
+++ b/ui/app/css/index.css
@@ -228,10 +228,8 @@ app sections
   font-size: 1em;
   height: 31px;
 }
-
-.editable-button{
-  position: relative;
-  bottom: 2px;
+.editable-label{
+  display: flex;
 }
 /* Webkit */
 .unlock-screen input::-webkit-input-placeholder {
diff --git a/ui/app/info.js b/ui/app/info.js
index 32b5a22e8..a473f5921 100644
--- a/ui/app/info.js
+++ b/ui/app/info.js
@@ -97,9 +97,9 @@ InfoScreen.prototype.render = function () {
 
               h('div.fa.fa-envelope', [
                 h('a.info', {
-                  href: 'mailto:hello@metamask.io?subject=Feedback',
                   target: '_blank',
                   style: { width: '85vw' },
+                  onClick () { chrome.tabs.create({url: 'mailto:help@metamask.io?subject=Feedback'}) },
                 }, 'Email us any questions or comments!'),
               ]),