diff --git a/src/app/settings/views/settings.html b/src/app/settings/views/settings.html
index 83803711..b92f1183 100644
--- a/src/app/settings/views/settings.html
+++ b/src/app/settings/views/settings.html
@@ -116,9 +116,9 @@
         <div class="list-group" ng-if="model.organizations && model.organizations.length">
             <a ng-repeat="org in model.organizations | orderBy: ['name']"
                href="javascript:void(0)" ng-click="org.type !== 2 && viewOrganization(org.id)" class="list-group-item">
-                <i class="fa fa-sitemap"></i>
+                <letter-avatar data="{{org.name}}" round="false" avwidth="25" avheight="25"
+                               avclass="img-rounded" fontsize="14"></letter-avatar>
                 {{org.name}}
-                <i class="fa fa-certificate" ng-show="org.type !== 2"></i>
             </a>
         </div>
         <div class="box-footer">
diff --git a/src/less/vault.less b/src/less/vault.less
index f022c053..d057380a 100644
--- a/src/less/vault.less
+++ b/src/less/vault.less
@@ -126,7 +126,7 @@ form .btn .loading-icon {
 }
 
 .dropdown-menu {
-    border-color: #ccc;
+    border-color: @table-border-color;
 
     > li > a {
         color: @text-color;
@@ -186,7 +186,7 @@ form .btn .loading-icon {
 
     label {
         display: block;
-        border-bottom: 1px solid @table-border-color;
+        border-bottom: 1px solid @box-border-color;
         border-radius: 3px;
         padding: 10px 10px 10px 30px;
         font-weight: bold;