diff --git a/src/popup/app/current/views/current.html b/src/popup/app/current/views/current.html
index d11c043d81a..8937727afa5 100644
--- a/src/popup/app/current/views/current.html
+++ b/src/popup/app/current/views/current.html
@@ -25,7 +25,10 @@
         </div>
     </div>
     <div class="centered-message" ng-if="loaded && !sites.length">
-        <p>No sites available to auto-fill for the current browser tab. <a href="" ng-click="addSite()">Add one</a></p>
+        <p>
+            No sites available to auto-fill for the current browser tab.
+            <button ng-click="addSite()" class="btn btn-link btn-lg btn-block">Add a site</button>
+        </p>
     </div>
     <div class="page-loading" ng-if="!loaded">
         <i class="fa fa-lg fa-spinner fa-spin"></i>
diff --git a/src/popup/app/settings/views/settingsFolders.html b/src/popup/app/settings/views/settingsFolders.html
index 358fda0520c..8c066b40398 100644
--- a/src/popup/app/settings/views/settingsFolders.html
+++ b/src/popup/app/settings/views/settingsFolders.html
@@ -19,7 +19,10 @@
         </div>
     </div>
     <div class="centered-message" ng-if="loaded && !folders.length">
-        <p>No folders to list. <a ui-sref="addFolder({animation: 'in-slide-up'})">Add one</a></p>
+        <p>
+            No folders to list.
+            <a ui-sref="addFolder({animation: 'in-slide-up'})" class="btn btn-link btn-lg btn-block">Add a folder</a>
+        </p>
     </div>
     <div class="page-loading" ng-if="!loaded">
         <i class="fa fa-lg fa-spinner fa-spin"></i>
diff --git a/src/popup/app/vault/views/vault.html b/src/popup/app/vault/views/vault.html
index 7d3b1c8c656..1ca181d2b12 100644
--- a/src/popup/app/vault/views/vault.html
+++ b/src/popup/app/vault/views/vault.html
@@ -36,7 +36,10 @@
         </div>
     </div>
     <div class="centered-message" ng-if="loaded && !vaultSites.length">
-        <p>No sites to list. <a href="" ng-click="addSite()">Add one</a></p>
+        <p>
+            No sites to list.
+            <button ng-click="addSite()" class="btn btn-link btn-lg btn-block">Add a site</button>
+        </p>
     </div>
     <div class="page-loading" ng-if="!loaded">
         <i class="fa fa-lg fa-spinner fa-spin"></i>
diff --git a/src/popup/less/components.less b/src/popup/less/components.less
index a01bd5e63ed..ed78139a8ba 100644
--- a/src/popup/less/components.less
+++ b/src/popup/less/components.less
@@ -414,7 +414,7 @@
     p {
         position: fixed;
         top: 50%;
-        margin-top: -20px;
+        margin-top: -40px;
         display: block;
         width: 100%;
         text-align: center;