diff --git a/src/popup/app/vault/views/vault.html b/src/popup/app/vault/views/vault.html
index 959757e4b2..7526e3470b 100644
--- a/src/popup/app/vault/views/vault.html
+++ b/src/popup/app/vault/views/vault.html
@@ -11,9 +11,9 @@
                 <i class="fa fa-folder-open"></i> {{folder.name}}
             </div>
             <a ui-sref="viewSite({siteId: site.id, animation: 'in-slide-up'})" class="list-grouped-item condensed" ng-repeat="site in folderSites = (vaultSites | filter: { folderId: folder.id } | orderBy: ['name', 'username'])">
+                <span class="btn-list"><i class="fa fa-lg fa-ellipsis-h text-muted"></i></span>
                 <span class="text">{{site.name}}</span>
                 <span class="detail">{{site.username}}</span>
-                <!--<span class="btn btn-link pull-right"><i class="fa fa-ellipsis-h"></i></span>-->
             </a>
         </div>
     </div>
diff --git a/src/popup/app/vault/views/vaultViewSite.html b/src/popup/app/vault/views/vaultViewSite.html
index a48b029650..c7d9fc551a 100644
--- a/src/popup/app/vault/views/vaultViewSite.html
+++ b/src/popup/app/vault/views/vaultViewSite.html
@@ -19,14 +19,18 @@
                     {{site.name}}
                 </div>
                 <div class="list-section-item">
+                    <a class="btn-list" href=""><i class="fa fa-lg fa-share-square-o"></i></a>
                     <span class="item-label">Website</span>
                     {{site.uri}}
                 </div>
                 <div class="list-section-item">
+                    <a class="btn-list" href=""><i class="fa fa-lg fa-clipboard"></i></a>
                     <span class="item-label">Username</span>
                     {{site.username}}
                 </div>
                 <div class="list-section-item">
+                    <a class="btn-list" href=""><i class="fa fa-lg fa-clipboard"></i></a>
+                    <a class="btn-list" href=""><i class="fa fa-lg fa-eye"></i></a>
                     <span class="item-label">Password</span>
                     {{site.maskedPassword}}
                 </div>
diff --git a/src/popup/less/components.less b/src/popup/less/components.less
index b6925dd723..bd7049c603 100644
--- a/src/popup/less/components.less
+++ b/src/popup/less/components.less
@@ -195,19 +195,21 @@
             background-color: @list-item-hover;
         }
 
-        &.condensed {
-            padding: 3px 10px;
-        }
-
         .text {
             display: block;
             color: @text-color;
+            white-space: nowrap;
+            overflow: hidden;
+            text-overflow: ellipsis;
         }
 
         .detail {
             font-size: @font-size-small;
             color: @gray-light;
             display: block;
+            white-space: nowrap;
+            overflow: hidden;
+            text-overflow: ellipsis;
         }
 
         label, .item-label {
@@ -218,6 +220,21 @@
             font-weight: normal;
         }
 
+        .btn-list {
+            cursor: pointer;
+            float: right;
+            display: block;
+            padding: 10px 8px 10px 12px;
+        }
+
+        &.condensed {
+            padding: 3px 10px;
+
+            .btn-list {
+                padding: 8px 8px 8px 12px;
+            }
+        }
+
         input:not([type="checkbox"]), select, textarea {
             border: none;
             width: 100%;