diff --git a/sass/credentials.scss b/sass/credentials.scss
index d5816e72..f9c55f4d 100644
--- a/sass/credentials.scss
+++ b/sass/credentials.scss
@@ -643,8 +643,11 @@
 
 .icon-label {
   overflow: hidden;
+  display: flex;
   input {
-    width: calc(100% - 28px) !important;
+    //width: calc(100% - 28px) !important;
+    //width: 100% !important;
+    //width: inherit !important;
     float: left;
     background: #fff;
     color: #555;
diff --git a/templates/views/partials/icon-picker.html b/templates/views/partials/icon-picker.html
index 00ff7031..4109a259 100644
--- a/templates/views/partials/icon-picker.html
+++ b/templates/views/partials/icon-picker.html
@@ -1,6 +1,13 @@
-<div class="cell icon-category-auth"></div>
+<div class="cell icon-category-auth" ng-if="!credential.url && !credential.icon"></div>
+
+<div class="cell" ng-if="credential.url || credential.icon">
+	<span class="icon">
+		<credential-icon credential="credential"></credential-icon>
+	</span>
+</div>
+
 <div style="display: none" id="iconPicker" title="{{ 'pick.icon' | translate }}">
-		<div class="iconList">
+	<div class="iconList">
 			<div ng-repeat="(groupName, icons) in iconGroups">
 				<h2 style="clear: both" id="{{groupName}}">{{groupName}}</h2>
 				<div class="icon" ng-repeat="icon in icons" ng-click="selectIcon(icon)">
@@ -8,22 +15,22 @@
 				</div>
 			</div>
 		</div>
-		<div class="iconModifier">
-			<input id="iconPicker-Search" class="iconSearch" type="text" placeholder="{{ 'pick.icon.search' | translate }}">
-			<label for="iconPicker-CustomIcon">{{ 'pick.icon.custom.label' | translate }}<label>
-            <input id="iconPicker-CustomIcon" class="iconSearch"  type="file"/>
-			<!--
-			<div ng-repeat="(groupName, icons) in iconGroups">
-				<a ng-click="jumpToGroup(groupName)">{{groupName}}</a>
-			</div>-->
-            <div ng-if="selectedIcon || customIcon">
-                {{ 'selected.icon' | translate}}: <br />
+	<div class="iconModifier">
+		<input id="iconPicker-Search" class="iconSearch" type="text" placeholder="{{ 'pick.icon.search' | translate }}">
+		<label for="iconPicker-CustomIcon">{{ 'pick.icon.custom.label' | translate }}</label>
+		<input id="iconPicker-CustomIcon" class="iconSearch"  type="file"/>
+		<!--
+		<div ng-repeat="(groupName, icons) in iconGroups">
+			<a ng-click="jumpToGroup(groupName)">{{groupName}}</a>
+		</div>-->
+		<div ng-if="selectedIcon || customIcon">
+			{{ 'selected.icon' | translate}}: <br />
 
-                <img ng-src="{{selectedIcon.url}}" height="32" ng-if="!customIcon">
-                <img src="{{customIcon.data}}" height="32" ng-if="customIcon">
-                <br />
-                <button ng-click="useIcon()">{{ 'use.icon' | translate}}</button>
-            </div>
+			<img ng-src="{{selectedIcon.url}}" height="32" ng-if="!customIcon">
+			<img src="{{customIcon.data}}" height="32" ng-if="customIcon">
+			<br />
+			<button ng-click="useIcon()">{{ 'use.icon' | translate}}</button>
 		</div>
 	</div>
+</div>
 
diff --git a/templates/views/show_vault.html b/templates/views/show_vault.html
index f1359f68..960b467b 100644
--- a/templates/views/show_vault.html
+++ b/templates/views/show_vault.html
@@ -48,10 +48,10 @@
 					<span class="tag" ng-repeat="tag in credential.tags_raw">{{ ::tag.text}}</span>
 
 					</span>
-					<span class="icon" ng-if="credential.url">
+					<span class="icon" ng-if="credential.url || credential.icon">
 						<credential-icon credential="credential"></credential-icon>
 					</span>
-					<span class="icon" ng-if="!credential.url">
+					<span class="icon" ng-if="!credential.url && !credential.icon">
 						<i class="fa fa-lock" ng-if="!credential.acl && !credential.shared_key"></i>
 						<i class="fa fa-share-alt" ng-if="credential.acl"></i>
 						<i class="fa fa-share-alt-square" ng-if="credential.shared_key"> </i>