diff --git a/css/style.css b/css/style.css
index 887d24fb1..524f29281 100644
--- a/css/style.css
+++ b/css/style.css
@@ -20,10 +20,44 @@
  *
  */
 
+/**
+ * General styles
+ */
+
+.app-deck .icon {
+	display: inline-block;
+}
+
+input.input-inline {
+	font-size: inherit !important;
+	font-weight: inherit;
+	background-color: transparent;
+	padding: 0;
+	border: none;
+	width: 100%;
+	border-bottom: 1px solid #333333;
+	-webkit-border-radius: 0;
+	line-height: 100%;
+	margin: -4px 0;
+}
+
+button {
+	border: 0;
+	background-color: transparent;
+}
+
+button:hover {
+	border: 0;
+	background-color: transparent;
+}
+
 #searchbox {
 	display: block !important;
 }
 
+/**
+ * Navigation sidebar
+ */
 .app-navigation-entry-utils-menu-button {
 	display: block !important;
 }
@@ -51,6 +85,9 @@
 	cursor: pointer;
 }
 
+/**
+ * Board view
+ */
 #app-view {
 	position: relative;
 	height: 100%;
@@ -184,6 +221,7 @@
 	border: 0;
 	background-color: transparent;
 	float: left;
+	min-height: initial;
 }
 
 .stack h2 button,
@@ -270,12 +308,6 @@
 	margin-top: 15px;
 }
 
-.card h3 .fa {
-	font-size: 18pt;
-	line-height: 10pt;
-	vertical-align: middle;
-}
-
 .card .labels {
 	position: absolute;
 	top: -5px;
@@ -342,9 +374,9 @@
 }
 
 .card.create h3 {
-	margin: 0;
-	padding: 0;
 	width: 100%;
+	padding: 0;
+	margin: 0 0 1px;
 }
 
 .card.create h3 input {
@@ -358,16 +390,7 @@
 	border-radius: 0;
 	color: #ffffff;
 	background-color: transparent !important;
-}
-
-.card.create .fa {
-	color: #ffffff;
-	width: 100%;
-}
-
-.card.create .fa:hover {
-	opacity: 0.5;
-	cursor: pointer;
+	min-height: initial;
 }
 
 .due {
@@ -378,6 +401,10 @@
 	margin-right: 2px;
 }
 
+/**
+ * Card view right sidebar
+ */
+
 #card-header {
 	height: 44px;
 }
@@ -442,20 +469,6 @@
 	background-color: white;
 }
 
-#card-description .container.ng-hide-remove {
-	animation: fade 1s forwards;
-	background-color: rgba(255, 255, 100, 1);
-}
-
-@keyframes fade {
-	from {
-		background-color: rgba(255, 255, 100, 1);
-	}
-	to {
-		background-color: rgba(255, 255, 255, 0);
-	}
-}
-
 #sidebar-header,
 .card-block {
 	padding: 15px;
@@ -528,7 +541,9 @@
 	display: block !important;
 }
 
-/* color selector */
+/**
+ * Color selection
+ */
 
 .colorselect {
 	overflow: hidden;
@@ -562,6 +577,9 @@
 	height: 26px;
 }
 
+/**
+ * Board list main screen area
+ */
 #boardlist {
 	width: 100%;
 	height: 100%;
@@ -607,30 +625,47 @@
 	margin-top: 5px;
 }
 
-input.input-inline {
-	font-size: inherit !important;
-	font-weight: inherit;
-	background-color: transparent;
+/**
+ * Board details
+ */
+
+#shareWithList {
+	list-style-type: none;
+	padding: 0 0 16px;
+}
+
+#shareWithList li {
+	padding-top: 5px;
+	padding-bottom: 5px;
+	font-weight: bold;
+	white-space: normal;
+	display: flex;
+	align-items: center;
+}
+
+#shareWithList .username {
+	padding-right: 8px;
+	padding-left: 8px;
+	white-space: nowrap;
+	text-overflow: ellipsis;
+	display: inline-block;
+	overflow: hidden;
+	vertical-align: middle;
+}
+
+.shareWithList .icon-delete {
+	display: inline-block;
+	background-size: 16px 16px;
+	width: 16px;
+	height: 16px;
 	padding: 0;
-	border: none;
-	width: 100%;
-	border-bottom: 1px solid #333333;
-	-webkit-border-radius: 0;
-	line-height: 100%;
-	margin: -4px 0;
+	margin-top: 5px;
 }
 
-button {
-	border: 0;
-	background-color: transparent;
+.shareOption {
+	margin-top: 4px;
 }
 
-button:hover {
-	border: 0;
-	background-color: transparent;
-}
-
-/* board detail */
 #board-detail-labels {
 	padding: 10px;
 }
@@ -692,6 +727,51 @@ button:hover {
 	display: none;
 }
 
+.ui-select-match-close {
+	float: right;
+	z-index: 100;
+	position: relative;
+	display: inline-block !important;
+	margin-right: 7px;
+}
+
+.ui-select-match-item {
+	padding: 0;
+	float: left !important;
+	display: block;
+}
+
+.ui-select-match-item .select-label {
+	color: #fff;
+	padding: 6px 23px 6px 6px;
+	margin-right: -23px !important;
+}
+
+.select2-container-multi .select2-choices .select2-search-choice {
+	padding: 3px 0 !important;
+	border: 0 !important;
+	overflow: hidden;
+}
+
+.ui-select-container[disabled] .ui-select-match-item .select-label {
+	padding: 4px;
+	min-width: 26px !important;
+	height: 100%;
+	display: inline-block;
+}
+
+.ui-select-container[disabled] .ui-select-match-item {
+	margin-right: 0 !important;
+}
+
+.select2-search input {
+	width:100% !important;
+}
+
+/**
+ * Mobile optimizations
+ */
+
 @media (max-width: 480px) {
 	/* hide board actions on mobile */
 	#board-actions {
@@ -705,6 +785,10 @@ button:hover {
 	}
 }
 
+/**
+ * Markdown rendering
+ */
+
 #markdown {
 	width: 100% !important;
 }
@@ -764,30 +848,9 @@ button:hover {
 	padding: 3px;
 }
 
-.shareWithList .username {
-	min-width: 100px;
-}
-
-.shareWithList .icon {
-	display: inline-block;
-	background-size: 16px 16px;
-	width: 16px;
-	height: 16px;
-}
-
-.shareWithList .fa {
-	font-size: 12pt;
-	width: 16px;
-	text-align: center;
-}
-
-.shareOption {
-	margin-top: 4px;
-}
-
-.app-deck .icon {
-	display: inline-block;
-}
+/**
+ * Custom icons
+ */
 
 .icon-group {
 	background-image: url('../../../settings/img/users.svg');
diff --git a/templates/part.board.sidebarView.php b/templates/part.board.sidebarView.php
index 3abca92d4..7cb494586 100644
--- a/templates/part.board.sidebarView.php
+++ b/templates/part.board.sidebarView.php
@@ -18,14 +18,14 @@
     <div id="commentsTabView" class="tab commentsTabView" ng-if="status.boardtab==0 || !status.boardtab">
 
         <ui-select ng-if="boardservice.canShare()" ng-model="status.addSharee" theme="select2" style="width:100%;" title="Choose a user to assign" placeholder="Assign users ..." on-select="aclAdd(status.addSharee)">
-            <ui-select-match placeholder="<?php p($l->t('Select users...')); ?>">
+            <ui-select-match placeholder="<?php p($l->t('Select users or groups to share with')); ?>">
                 <span><i class="icon icon-{{$item.type}}"></i> {{ $item.participant }}</span>
             </ui-select-match>
             <ui-select-choices refresh="searchForUser($select.search)" refresh-delay="0" repeat="sharee in boardservice.sharees">
                 <span><i class="icon icon-{{sharee.type}}"></i> {{ sharee.participant }}</span>
             </ui-select-choices>
             <ui-select-no-choice>
-            <?php p($l->t('No users found.')); ?>
+            <?php p($l->t('No matching user or group found.')); ?>
             </ui-select-no-choice>
         </ui-select>
 
@@ -34,8 +34,8 @@
                 <span class="icon-loading-small" style="display:none;"></span>
                 <div class="avatardiv" avatar ng-attr-displayname="{{ boardservice.getCurrent().owner }}" ng-if="boardservice.id"></div>
                 <span class="has-tooltip username">
-                    {{ boardservice.getCurrent().owner }}</span>
-                <span class="shareOption"><?php p($l->t('Board owner')); ?></span>
+                    {{ boardservice.getCurrent().owner }}
+				</span>
             </li>
             <li ng-repeat="acl in boardservice.getCurrent().acl track by $index">
                 <span class="icon-loading-small" style="display:none;"></span>
@@ -43,7 +43,9 @@
                 <div class="avatardiv" ng-if="acl.type=='group'"><i class="icon icon-{{acl.type}}"></i></div>
 
                 <span class="has-tooltip username">
-                    {{ acl.participant }}</span>
+                    {{ acl.participant }}
+				</span>
+				<span class="sharingOptionsGroup">
                 <span class="shareOption" ng-if="boardservice.canManage()">
                     <input type="checkbox" class="permissions checkbox" id="checkbox-permission-{{ acl.id }}-share" ng-model="acl.permissionShare" ng-change="aclUpdate(acl)" />
                     <label for="checkbox-permission-{{ acl.id }}-share"><?php p($l->t('Share')); ?></label>
@@ -56,7 +58,8 @@
                     <input type="checkbox" class="permissions checkbox" id="checkbox-permission-{{ acl.id }}-manage" ng-model="acl.permissionManage" ng-change="aclUpdate(acl)" />
                     <label for="checkbox-permission-{{ acl.id }}-manage"><?php p($l->t('Manage')); ?></label>
                 </span>
-                <a ng-if="boardservice.canManage()" class="unshare" ng-click="aclDelete(acl)"><span class="icon-loading-small hidden"></span><span class="icon icon-delete"></span><span class="hidden-visually"><?php p($l->t('Discard share')); ?></span></a>
+				</span>
+                <a ng-if="boardservice.canManage()" ng-click="aclDelete(acl)"><span class="icon-loading-small hidden"></span><span class="icon icon-delete"></span><span class="hidden-visually"><?php p($l->t('Discard share')); ?></span></a>
             </li>
         </ul>
 
diff --git a/templates/part.card.php b/templates/part.card.php
index c5b645fb6..ec2548455 100644
--- a/templates/part.card.php
+++ b/templates/part.card.php
@@ -30,14 +30,13 @@
 	</div>
 
 	<div id="labels">
-		<ui-select multiple tagging="" ng-model="card.labels" theme="bootstrap"
+		<ui-select multiple tagging="" ng-model="card.labels" theme="select2"
 				   style="width:100%;" title="Choose a label"
 				   placeholder="Add a label"
 				   on-select="labelAssign($item, $model)"
 				   on-remove="labelRemove($item, $model)" ng-disabled="!boardservice.canEdit() || archived">
-			<ui-select-match placeholder="Select labels..."><span
-					class="select-label"
-					style="background-color:#{{$item.color}}; color:{{ $item.color|textColorFilter }};">{{$item.title}}&nbsp;</span>
+			<ui-select-match placeholder="Select labels...">
+				<span class="select-label" style="background-color:#{{$item.color}}; color:{{ $item.color|textColorFilter }};">{{$item.title}}&nbsp;</span>
 			</ui-select-match>
 			<ui-select-choices
 				repeat="label in boardservice.getCurrent().labels | filter:$select.search">