diff --git a/css/style.css b/css/style.css
index 887d24fb1..a22712252 100644
--- a/css/style.css
+++ b/css/style.css
@@ -184,6 +184,7 @@
 	border: 0;
 	background-color: transparent;
 	float: left;
+	min-height: initial;
 }
 
 .stack h2 button,
@@ -692,6 +693,45 @@ 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;
+	padding-right: 23px;
+	margin-right: -23px !important;
+}
+
+.select2-container-multi .select2-choices .select2-search-choice {
+	padding: 3px 0 !important;
+	border: 0 !important;
+	overflow: hidden;
+	bo
+}
+
+.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;
+}
+
 @media (max-width: 480px) {
 	/* hide board actions on mobile */
 	#board-actions {
@@ -764,15 +804,37 @@ button:hover {
 	padding: 3px;
 }
 
-.shareWithList .username {
-	min-width: 100px;
+#shareWithList {
+	list-style-type: none;
+	padding: 0 0 16px;
 }
 
-.shareWithList .icon {
+#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;
+	margin-top: 5px;
 }
 
 .shareWithList .fa {
@@ -785,6 +847,10 @@ button:hover {
 	margin-top: 4px;
 }
 
+/**
+ * Custom icons
+ */
+
 .app-deck .icon {
 	display: inline-block;
 }
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">