diff --git a/src/app/organization/organizationSubvaultsController.js b/src/app/organization/organizationSubvaultsController.js
index 0eeb8a40c4e..8fca4ee1f0d 100644
--- a/src/app/organization/organizationSubvaultsController.js
+++ b/src/app/organization/organizationSubvaultsController.js
@@ -45,6 +45,7 @@
                 templateUrl: 'app/organization/views/organizationSubvaultsUsers.html',
                 controller: 'organizationSubvaultsUsersController',
                 size: 'lg',
+                windowClass: 'organizationSubvaultsUsersModal',
                 resolve: {
                     subvault: function () { return subvault; }
                 }
diff --git a/src/app/organization/organizationSubvaultsUsersController.js b/src/app/organization/organizationSubvaultsUsersController.js
index 959e2ed1801..55f14166ef8 100644
--- a/src/app/organization/organizationSubvaultsUsersController.js
+++ b/src/app/organization/organizationSubvaultsUsersController.js
@@ -8,6 +8,8 @@
         $scope.users = [];
 
         $uibModalInstance.opened.then(function () {
+            $scope.modalWindow = angular.element(document).find('.organizationSubvaultsUsersModal');
+
             $scope.loading = false;
             apiService.subvaultUsers.listSubvault(
                 {
diff --git a/src/app/organization/views/organizationPeople.html b/src/app/organization/views/organizationPeople.html
index 8fb093016ad..e9d2276f8c2 100644
--- a/src/app/organization/views/organizationPeople.html
+++ b/src/app/organization/views/organizationPeople.html
@@ -39,6 +39,11 @@
                                         <i class="fa fa-cog"></i> <span class="caret"></span>
                                     </button>
                                     <ul class="dropdown-menu" uib-dropdown-menu>
+                                        <li>
+                                            <a href="javascript:void(0)" ng-click="edit(user.id)">
+                                                <i class="fa fa-fw fa-pencil"></i> Edit
+                                            </a>
+                                        </li>
                                         <li ng-show="user.status === 1">
                                             <a href="javascript:void(0)" ng-click="confirm(user)">
                                                 <i class="fa fa-fw fa-check"></i> Confirm
diff --git a/src/app/organization/views/organizationSubvaultsUsers.html b/src/app/organization/views/organizationSubvaultsUsers.html
index 290bff50a7f..94a8b7d3014 100644
--- a/src/app/organization/views/organizationSubvaultsUsers.html
+++ b/src/app/organization/views/organizationSubvaultsUsers.html
@@ -9,15 +9,23 @@
     <div ng-show="!loading && !users.length">
         <p>No users.</p>
     </div>
-    <div class="table-responsive" ng-show="users.length">
-        <table class="table table-striped table-hover table-vmiddle">
+    <div class="table-responsive" ng-show="users.length" style="margin: 0;">
+        <table class="table table-striped table-hover table-vmiddle" style="margin: 0;">
             <tbody>
                 <tr ng-repeat="user in users | orderBy: ['email']">
-                    <td style="width: 40px;">
-                        <button type="button" class="btn btn-link btn-table" uib-tooltip="Remove User"
-                                ng-click="remove(user)">
-                            <i class="fa fa-lg fa-remove"></i>
-                        </button>
+                    <td style="width: 70px;">
+                        <div class="btn-group" uib-dropdown dropdown-append-to="modalWindow">
+                            <button type="button" class="btn btn-default" uib-dropdown-toggle>
+                                <i class="fa fa-cog"></i> <span class="caret"></span>
+                            </button>
+                            <ul class="dropdown-menu" uib-dropdown-menu>
+                                <li>
+                                    <a href="javascript:void(0)" ng-click="remove(user)" class="text-red">
+                                        <i class="fa fa-fw fa-remove"></i> Remove
+                                    </a>
+                                </li>
+                            </ul>
+                        </div>
                     </td>
                     <td style="width: 45px;">
                         <letter-avatar data="{{user.name || user.email}}"></letter-avatar>
@@ -41,9 +49,6 @@
             </tbody>
         </table>
     </div>
-    <h4>Add User</h4>
-    <p>Coming soon...</p>
-    <p>Navigate to a specific user from the "people" page to associate them to a subvault.</p>
 </div>
 <div class="modal-footer">
     <button type="button" class="btn btn-default btn-flat" ng-click="close()">Close</button>
diff --git a/src/app/vault/views/vault.html b/src/app/vault/views/vault.html
index 1b0913deb21..ef5c8a04ebf 100644
--- a/src/app/vault/views/vault.html
+++ b/src/app/vault/views/vault.html
@@ -76,7 +76,7 @@
                             </td>
                             <td>
                                 <a href="javascript:void(0)" ng-click="editLogin(login)">{{login.name}}</a>
-                                <i class="fa fa-user text-muted" uib-tooltip="Shared" ng-show="login.organizationId"></i>
+                                <i class="fa fa-share-alt text-muted" uib-tooltip="Shared" ng-show="login.organizationId"></i>
                                 <div class="text-sm text-muted">{{login.username}}</div>
                             </td>
                         </tr>
@@ -164,7 +164,7 @@
                             <td>
                                 <a href="javascript:void(0)" ng-click="editLogin(login)">{{login.name}}</a>
                                 <i class="fa fa-star text-muted" uib-tooltip="Favorite" ng-show="login.favorite"></i>
-                                <i class="fa fa-user text-muted" uib-tooltip="Shared" ng-show="login.organizationId"></i>
+                                <i class="fa fa-share-alt text-muted" uib-tooltip="Shared" ng-show="login.organizationId"></i>
                                 <div class="text-sm text-muted">{{login.username}}</div>
                             </td>
                         </tr>
diff --git a/src/app/vault/views/vaultSubvaults.html b/src/app/vault/views/vaultSubvaults.html
index 77dcc3e4562..f3e4765db64 100644
--- a/src/app/vault/views/vaultSubvaults.html
+++ b/src/app/vault/views/vaultSubvaults.html
@@ -15,7 +15,7 @@
          ng-show="subvaults.length && (!main.searchVaultText || subvaultLogins.length)">
         <div class="box-header with-border">
             <h3 class="box-title">
-                <i class="fa fa-server"></i>
+                <i class="fa fa-share-alt-square"></i>
                 {{subvault.name}} <small>{{subvaultLogins.length}} logins</small>
             </h3>
             <div class="box-tools">