diff --git a/sass/app.scss b/sass/app.scss
index 92f66161..e41c491c 100644
--- a/sass/app.scss
+++ b/sass/app.scss
@@ -67,7 +67,7 @@
   top: 45px;
   right: 0;
   left: 0;
-
+  border-bottom: 1px solid #c9c9c9;
   padding: 0 !important;
   margin: 0;
   background-color: rgba(255, 255, 255, .95);
diff --git a/sass/credentials.scss b/sass/credentials.scss
index b87389cb..b5c3892e 100644
--- a/sass/credentials.scss
+++ b/sass/credentials.scss
@@ -573,21 +573,22 @@
     @include border-left-radius(0)
   }
   .icon-picker {
-    float: left;
+    //float: left;
     margin-top: 3px;
     margin-left: -3px;
-    @include border-left-radius(3px);
+    //@include border-left-radius(3px);
     .cell {
+      //min-height: 44px;
       padding: 7px 12px 2px 12px;
       display: inline-block;
       font-size: 14px;
       border: 1px solid #ddd;
       background-color: lighten(#ddd, 5%);
       cursor: pointer;
-      @include border-left-radius(6px);
-      img {
-        height: 16px;
-      }
+      //@include border-left-radius(6px);
+      //img {
+      // height: 16px;
+      //}
     }
     .cell:hover {
       color: rgb(0, 102, 255);
diff --git a/sass/partials/tabs.scss b/sass/partials/tabs.scss
index d9e33964..7a5a0ca6 100644
--- a/sass/partials/tabs.scss
+++ b/sass/partials/tabs.scss
@@ -21,7 +21,9 @@
  */
 
 .tab_header {
-  margin: 44px 0 0;
+  width: calc(100vw - 300px);
+ // margin: 44px 0 0;
+  margin: 0 0 0;
   list-style: none;
   padding: 0;
   li.tab:first-child {
@@ -45,9 +47,15 @@
       display: none;
     }
   }
+
+  li.inactive {
+    background-color: #fff !important;
+    color: unset !important;
+  }
+
   li.active {
-    color: #fff;
-    position: relative;
+
+    //position: relative;
     .indicator {
       display: inline-block;
       position: absolute;
@@ -60,10 +68,9 @@
 }
 
 .tab_container {
-  border: 1px solid;
-  border-color: #eee;
+  border: 1px solid #eee;
   border-top-color: #0082c9;
-  border-bottom: 0;
+  border-bottom-width: 0;
   clear: both;
   padding: 0 1em;
 }
diff --git a/templates/views/edit_credential.html b/templates/views/edit_credential.html
index 10ee9e7f..b03e8031 100644
--- a/templates/views/edit_credential.html
+++ b/templates/views/edit_credential.html
@@ -1,7 +1,6 @@
 <div id="passman-controls">
 
-<div id="controls" class="breadcrumb">
-	<div class="actions creatable">
+	<div class="breadcrumb">
 		<div class="breadcrumb">
 			<div class="crumb svg ui-droppable" data-dir="/">
 				<a ng-click="logout()"><i class="fa fa-home"></i></a>
@@ -15,13 +14,13 @@
 				<a ng-if="!storedCredential.credential_id">{{ 'create.credential' | translate}}</a>
 			</div>
 		</div>
+
 	</div>
 </div>
-</div>
 <div>
 <ul class="tab_header">
 	<li ng-repeat="tab in tabs track by $index" class="tab"
-		ng-class="{active:isActiveTab(tab)}"
+		ng-class="isActiveTab(tab)? 'active' : 'inactive'"
 		ng-click="onClickTab(tab)" use-theme color="'true'"
 	>{{tab.title}}
 		<div class="indicator"  use-theme negative="'true'"></div>
diff --git a/templates/views/partials/icon-picker.html b/templates/views/partials/icon-picker.html
index 892244be..7de7b864 100644
--- a/templates/views/partials/icon-picker.html
+++ b/templates/views/partials/icon-picker.html
@@ -1,6 +1,8 @@
 <div>
 	<div class="cell">
-		<credential-icon credential="credential"></credential-icon>
+		<span >
+			<span class="icon icon-category-auth"></span>
+		</span>
 	</div>
 	<div style="display: none" id="iconPicker" title="{{ 'pick.icon' | translate }}">
 		<div class="iconList">