diff --git a/skins/elastic/styles/styles.less b/skins/elastic/styles/styles.less
index 564a1cd89..05145163f 100644
--- a/skins/elastic/styles/styles.less
+++ b/skins/elastic/styles/styles.less
@@ -175,4 +175,12 @@ a:hover {
             line-height: 1.2;
         }
     }
+
+    &.readonly {
+        .source.row {
+            color: @color-form-hint;
+            font-size: 90%;
+            margin-bottom: .25rem;
+        }
+    }
 }
diff --git a/skins/elastic/styles/widgets/common.less b/skins/elastic/styles/widgets/common.less
index d5b2596fd..e00c7b274 100644
--- a/skins/elastic/styles/widgets/common.less
+++ b/skins/elastic/styles/widgets/common.less
@@ -145,13 +145,13 @@ font.bold {
 .table-widget {
     display: flex;
     flex-direction: column;
-    height: 22rem;
     margin-bottom: .5rem;
     border: 1px solid @color-table-border;
 
     & > .content {
         overflow-x: auto;
         flex-grow: 1;
+        height: 18.5em;
 
         table th {
             border-top: 0;
@@ -169,6 +169,7 @@ font.bold {
 
     table {
         margin: 0;
+        height: 18.5em;
     }
 
     // Options table is a table with first column for identifier/description
@@ -184,6 +185,10 @@ font.bold {
             }
         }
 
+        tr:last-child td {
+            border-bottom: 1px solid #e9ecef; // TODO: color from Bootstrap, use var
+        }
+
         tr.selected td {
             background-color: @color-table-selected-background;
             color: @color-table-selected;
diff --git a/skins/elastic/styles/widgets/forms.less b/skins/elastic/styles/widgets/forms.less
index 65afa711f..ed22b2436 100644
--- a/skins/elastic/styles/widgets/forms.less
+++ b/skins/elastic/styles/widgets/forms.less
@@ -128,6 +128,10 @@ input.smart-upload {
                 margin: 0;
             }
 
+            .row.input-group {
+                margin-bottom: 0 !important;
+            }
+
             label {
                 min-width: 7rem;
                 // Overwrite Bootstrap .input-group-addon style to make the label transparent
diff --git a/skins/elastic/styles/widgets/toolbar.less b/skins/elastic/styles/widgets/toolbar.less
index 45f1d5949..c520cf9a0 100644
--- a/skins/elastic/styles/widgets/toolbar.less
+++ b/skins/elastic/styles/widgets/toolbar.less
@@ -549,6 +549,15 @@
     a.status:before {
         content: @fa-var-lightbulb-o;
     }
+    a.folders:before {
+        content: @fa-var-folder;
+    }
+    a.remove:before {
+        content: @fa-var-eraser;
+    }
+    a.showurl:before {
+        content: @fa-var-link;
+    }
 }
 
 #layout > .sidebar > .header,
diff --git a/skins/elastic/templates/contact.html b/skins/elastic/templates/contact.html
index 7d7fa789f..849a2ec92 100644
--- a/skins/elastic/templates/contact.html
+++ b/skins/elastic/templates/contact.html
@@ -3,17 +3,16 @@
 <h1 class="voice"><roundcube:label name="contactproperties" /></h1>
 
 <div class="formcontent">
-	<roundcube:if condition="strlen(env:sourcename)" />
-		<div id="sourcename"><roundcube:label name="addressbook" />: <roundcube:var name="env:sourcename" /></div>
-	<roundcube:endif />
 	<div class="contact-header">
 		<div id="contactphoto" class="contact-photo">
-			<roundcube:object name="contactphoto" id="contactpic" placeholder="/images/contactpic.png" placeholderGroup="/images/contactgroup.png" />
+			<roundcube:object name="contactphoto" id="contactpic" placeholder="/images/contactpic.png"
+				placeholderGroup="/images/contactgroup.png" />
 		</div>
-		<roundcube:object name="contacthead" id="contacthead" class="contact-head" />
+		<roundcube:object name="contacthead" id="contacthead" class="contact-head readonly" with-source="true" />
 	</div>
 	<div id="contacttabs" class="tabbed">
-		<roundcube:object name="contactdetails" fieldset-class="propform groupped readonly" short-legend-labels="true" />
+		<roundcube:object name="contactdetails" fieldset-class="propform groupped readonly"
+			short-legend-labels="true" />
 	</div>
 </div>
 
diff --git a/skins/elastic/templates/contactedit.html b/skins/elastic/templates/contactedit.html
index 11e5e5ae5..32a678ff4 100644
--- a/skins/elastic/templates/contactedit.html
+++ b/skins/elastic/templates/contactedit.html
@@ -3,12 +3,6 @@
 <h1 class="voice"><roundcube:object name="steptitle" /></h1>
 
 <roundcube:form name="editform" method="post" id="contact-details" class="formcontent">
-	<roundcube:if condition="strlen(env:sourcename)" />
-		<div id="sourcename">
-			<roundcube:label name="addressbook" />: <roundcube:var name="env:sourcename" condition="env:action!='add'" />
-			<roundcube:object name="sourceselector" id="sourceselect" condition="env:action=='add'" />
-		</div>
-	<roundcube:endif />
 	<div class="contact-header">
 		<fieldset id="contactphoto" class="contact-photo">
 			<legend class="voice"><roundcube:label name="contactphoto" /></legend>
@@ -18,7 +12,7 @@
 			<roundcube:endif />
 		</fieldset>
 		<roundcube:object name="contactedithead" id="contacthead" form="editform"
-			class="propform contact-head" use-labels="true" />
+			class="propform contact-head" use-labels="true" with-source="true" />
 	</div>
 	<div id="contacttabs" class="tabbed">
 		<roundcube:object name="contacteditform" textareacols="60" form="editform"