diff --git a/src/popup/app/current/views/current.html b/src/popup/app/current/views/current.html
index 35168cfbee9..50c439c6c3b 100644
--- a/src/popup/app/current/views/current.html
+++ b/src/popup/app/current/views/current.html
@@ -8,21 +8,23 @@
     <div ng-if="sites.length">
         <div class="list">
             <div class="list-grouped">
-                <div ng-click="fillSite(site)" class="list-grouped-item condensed" style="cursor: pointer;"
-                     ng-repeat="site in theSites = (sites | orderBy: ['name', 'username'])">
-                    <a class="btn-list" href="" ng-click="$event.stopPropagation()" title="Copy Password"
-                       ngclipboard ngclipboard-error="clipboardError(e)" ngclipboard-success="clipboardSuccess(e, 'Password')"
-                       data-clipboard-text="{{site.password}}" ng-class="{'disabled': !site.password}">
+                <a href="javascript:void(0)" ng-click="fillSite(site)" class="list-grouped-item condensed"
+                   title="Auto-fill {{site.name}}" ng-repeat="site in theSites = (sites | orderBy: ['name', 'username'])">
+                    <span class="btn-list" href="" ng-click="$event.stopPropagation()" title="Copy Password"
+                          ngclipboard ngclipboard-error="clipboardError(e)"
+                          ngclipboard-success="clipboardSuccess(e, 'Password')"
+                          data-clipboard-text="{{site.password}}" ng-class="{'disabled': !site.password}">
                         <i class="fa fa-lg fa-key"></i>
-                    </a>
-                    <a class="btn-list" href="" ng-click="$event.stopPropagation()" title="Copy Username"
-                       ngclipboard ngclipboard-error="clipboardError(e)" ngclipboard-success="clipboardSuccess(e, 'Username')"
-                       data-clipboard-text="{{site.username}}" ng-class="{'disabled': !site.username}">
+                    </span>
+                    <span class="btn-list" href="" ng-click="$event.stopPropagation()" title="Copy Username"
+                          ngclipboard ngclipboard-error="clipboardError(e)"
+                          ngclipboard-success="clipboardSuccess(e, 'Username')"
+                          data-clipboard-text="{{site.username}}" ng-class="{'disabled': !site.username}">
                         <i class="fa fa-lg fa-user"></i>
-                    </a>
+                    </span>
                     <span class="text">{{site.name}}</span>
                     <span class="detail">{{site.username}}</span>
-                </div>
+                </a>
             </div>
         </div>
     </div>
diff --git a/src/popup/app/vault/views/vault.html b/src/popup/app/vault/views/vault.html
index 753ef46eef7..1bc0cf53d0e 100644
--- a/src/popup/app/vault/views/vault.html
+++ b/src/popup/app/vault/views/vault.html
@@ -15,7 +15,8 @@
                     <div class="list-grouped-header">
                         <i class="fa fa-folder-open"></i> {{folder.name}}
                     </div>
-                    <a href="javascript:void(0)" ng-click="viewSite(site)" class="list-grouped-item condensed"
+                    <a href="javascript:void(0)" ng-click="viewSite(site)"
+                       class="list-grouped-item condensed" title="Edit {{site.name}}"
                        ng-repeat="site in folderSites = (vaultSites | filter: { folderId: folder.id }
                             | filter: searchSites() | orderBy: ['name', 'username'])">
                         <span class="btn-list" ng-click="$event.stopPropagation()" title="Copy Password" ngclipboard
diff --git a/src/popup/less/components.less b/src/popup/less/components.less
index d3588d7342d..341b0a1109c 100644
--- a/src/popup/less/components.less
+++ b/src/popup/less/components.less
@@ -286,10 +286,10 @@
             }
 
             &.disabled {
-                color: @text-disabled;
+                color: @list-icon-color;
 
                 &:hover {
-                    color: @text-disabled;
+                    color: @list-icon-color;
                 }
             }
 
diff --git a/src/popup/less/variables.less b/src/popup/less/variables.less
index 9d9c3fa2a1c..204278072b7 100644
--- a/src/popup/less/variables.less
+++ b/src/popup/less/variables.less
@@ -8,7 +8,6 @@
 @border-color: #f0f0f0;
 @border-color-dark: #ddd;
 @list-item-hover: #fbfbfb;
-@text-disabled: #d2d6de;
 @list-icon-color: #c7c7cd;
 
 @brand-primary: #3c8dbc;