Merge branch 'master' into i340+1

6 files changed, 11 insertions, 2 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 f505c89c0..1ae579664 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/components/transaction-list-item-icon.js b/ui/app/components/transaction-list-item-icon.js
index c640de551..8b118b1d4 100644
--- a/ui/app/components/transaction-list-item-icon.js
+++ b/ui/app/components/transaction-list-item-icon.js
@@ -15,7 +15,7 @@ TransactionIcon.prototype.render = function () {
   const { transaction, txParams, isMsg } = this.props
 
   if (transaction.status === 'rejected') {
-    return h('i.fa.fa-exclamation-triangle.fa-lg.error', {
+    return h('i.fa.fa-exclamation-triangle.fa-lg.warning', {
       style: {
         width: '24px',
       },
diff --git a/ui/app/components/transaction-list-item.js b/ui/app/components/transaction-list-item.js
index 94fde697e..82176059f 100644
--- a/ui/app/components/transaction-list-item.js
+++ b/ui/app/components/transaction-list-item.js
@@ -57,7 +57,7 @@ TransactionListItem.prototype.render = function () {
 
       // large identicon
       h('.identicon-wrapper.flex-column.flex-center.select-none', [
-        transaction.status === 'unconfirmed' ? h('.red-dot', ' ')
+        transaction.status === 'unconfirmed' ? h('i.fa.fa-ellipsis-h', {style: { fontSize: '27px' }})
          : h(TransactionIcon, { txParams, transaction, isTx, isMsg }),
       ]),
 
diff --git a/ui/app/css/index.css b/ui/app/css/index.css
index 24497a66f..d46c859ad 100644
--- a/ui/app/css/index.css
+++ b/ui/app/css/index.css
@@ -171,6 +171,11 @@ app sections
 .error {
   color: #E20202;
 }
+
+.warning {
+  color: #FFAE00;
+}
+
 .lock {
   width: 50px;
   height: 50px;