diff --git a/approot/explore.xml b/approot/explore.xml
index b61d5d62..a53455fb 100644
--- a/approot/explore.xml
+++ b/approot/explore.xml
@@ -13,22 +13,15 @@
 	</div>
 </message>
 
-<message id="Lms.Explore.template.add-btn">
-	<i class="fa fa-plus-circle Lms-explore-btn Lms-control-btn"></i>
-</message>
-
-<message id="Lms.Explore.template.play-btn">
-	<i class="fa fa-play-circle Lms-explore-btn Lms-control-btn"></i>
-</message>
+<message id="Lms.Explore.template.add-btn"><i class="fa fa-plus-circle Lms-explore-btn Lms-control-btn"></i></message>
+<message id="Lms.Explore.template.play-btn"><i class="fa fa-play-circle Lms-explore-btn Lms-control-btn"></i></message>
 
 <message id="Lms.Explore.template.filters">
 	<h3>${tr:Lms.Explore.filters} ${add-filter class="btn-primary"}</h3>
 	${clusters}
 </message>
 
-<message id="Lms.Explore.template.cluster-entry">
-	<span class="badge {1}">${<if-can-delete>}<i class="fa fa-times-circle"></i> ${</if-can-delete>}${name}</span>
-</message>
+<message id="Lms.Explore.template.cluster-entry"><span class="badge {1}">${<if-can-delete>}<i class="fa fa-times-circle"></i> ${</if-can-delete>}${name}</span></message>
 
 <message id="Lms.Explore.template.add-filter">
 	<div class="form-horizontal">
diff --git a/approot/playqueue.xml b/approot/playqueue.xml
index 3852af69..0a09276c 100644
--- a/approot/playqueue.xml
+++ b/approot/playqueue.xml
@@ -2,21 +2,10 @@
 <messages xmlns:if="Wt.WTemplate.conditions">
 <!--FORMS message blocks-->
 
-<message id="Lms.PlayQueue.template.clear-btn">
-	<i class="fa fa-times-circle Lms-playqueue-btn Lms-control-btn"></i>
-</message>
-
-<message id="Lms.PlayQueue.template.shuffle-btn">
-	<i class="fa fa-random Lms-playqueue-btn Lms-control-btn"></i>
-</message>
-
-<message id="Lms.PlayQueue.template.repeat-btn">
-	<i class="fa fa-repeat Lms-playqueue-btn Lms-control-btn"></i>
-</message>
-
-<message id="Lms.PlayQueue.template.radio-btn">
-	<i class="fa fa-rss Lms-playqueue-btn Lms-control-btn"></i>
-</message>
+<message id="Lms.PlayQueue.template.clear-btn"><i class="fa fa-fw fa-times-circle Lms-playqueue-btn Lms-control-btn"></i></message>
+<message id="Lms.PlayQueue.template.shuffle-btn"><i class="fa fa-fw fa-random Lms-playqueue-btn Lms-control-btn"></i></message>
+<message id="Lms.PlayQueue.template.repeat-btn"><i class="fa fa-fw fa-repeat Lms-playqueue-btn Lms-control-btn"></i></message>
+<message id="Lms.PlayQueue.template.radio-btn"><i class="fa fa-fw fa-rss Lms-playqueue-btn Lms-control-btn"></i></message>
 
 <message id="Lms.PlayQueue.template">
 	<div class="row">
@@ -36,13 +25,8 @@
 	</div>
 </message>
 
-<message id="Lms.PlayQueue.template.play-btn">
-	<i class="fa fa-play-circle Lms-playqueue-btn Lms-control-btn"></i>
-</message>
-
-<message id="Lms.PlayQueue.template.delete-btn">
-	<i class="fa fa-times-circle Lms-playqueue-btn Lms-control-btn"></i>
-</message>
+<message id="Lms.PlayQueue.template.play-btn"><i class="fa fa-fw fa-play-circle Lms-playqueue-btn Lms-control-btn"></i></message>
+<message id="Lms.PlayQueue.template.delete-btn"><i class="fa fa-fw fa-times-circle Lms-playqueue-btn Lms-control-btn"></i></message>
 
 <message id="Lms.PlayQueue.template.entry">
 	<div class="row Lms-playqueue-entry Lms-entry-hoverable Lms-vertical-align">
@@ -54,7 +38,7 @@
 			${</if-has-artists-or-release>}
 		</div>
 		<div class="col-xs-3">
-			<div class="Lms-playqueue-entry-controls">
+			<div class="Lms-playqueue-entry-controls Lms-vertical-align">
 				${play-btn}${del-btn}
 			</div>
 			<div class="Lms-playqueue-entry-duration text-muted">
diff --git a/docroot/css/lms-darkly.css b/docroot/css/lms-darkly.css
index 6398d22e..9bcc7a1f 100644
--- a/docroot/css/lms-darkly.css
+++ b/docroot/css/lms-darkly.css
@@ -9,6 +9,14 @@
 	color: #7e7e7e;
 }
 
+.Lms-artistname.text-primary, .Lms-artistname.text-primary:hover {
+	color: var(--body-color)
+}
+
+a.Lms-artistname.text-primary:hover {
+	color: var(--hover-color)
+}
+
 .Lms-player-btn {
 	color: var(--body-color)
 }
diff --git a/docroot/css/lms.css b/docroot/css/lms.css
index a9a87af6..aa6b498d 100644
--- a/docroot/css/lms.css
+++ b/docroot/css/lms.css
@@ -53,6 +53,8 @@ a.Lms-artistname:hover, a.Lms-artistname:focus {
 .Lms-cluster {
 	display: inline;
 	cursor: pointer;
+	line-height: 32px;
+	margin: 4px;
 }
 
 .Lms-cluster:hover {
@@ -247,7 +249,9 @@ a.Lms-artistname:hover, a.Lms-artistname:focus {
 }
 
 .Lms-explore-btn {
-	font-size: 22px !important;
+	font-size: 24px !important;
+	text-align: center;
+	width: 28px;
 	cursor: pointer;
 }
 
@@ -270,7 +274,11 @@ a.Lms-artistname:hover, a.Lms-artistname:focus {
 .Lms-playqueue-btn {
 	font-size: 22px !important;
 	cursor: pointer;
-	margin: 2px;
+}
+
+.text-success .Lms-playqueue-btn {
+	filter: brightness(130%);
+	filter: drop-shadow(0 0 0.65rem var(--hover-color));
 }
 
 .Lms-playqueue-entry-controls {
diff --git a/src/lms/ui/LmsApplication.cpp b/src/lms/ui/LmsApplication.cpp
index 82f38515..0f490b94 100644
--- a/src/lms/ui/LmsApplication.cpp
+++ b/src/lms/ui/LmsApplication.cpp
@@ -128,7 +128,6 @@ LmsApplication::LmsApplication(const Wt::WEnvironment& env,
 					Wt::WLinkedCssStyleSheet {Wt::WLink {"css/lms-flatly.css"}},
 //					Wt::WLinkedCssStyleSheet {Wt::WLink {"css/bootstrap-darkly.min.css"}},
 //					Wt::WLinkedCssStyleSheet {Wt::WLink {"css/lms-darkly.css"}},
-//					Wt::WLinkedCssStyleSheet {Wt::WLink {"css/bootstrap-slate.css"}},
 					Wt::WLinkedCssStyleSheet { Wt::WLink {"resources/themes/bootstrap/3/wt.css"}},
 				};
 			}
diff --git a/src/lms/ui/PlayQueueView.cpp b/src/lms/ui/PlayQueueView.cpp
index e55476b6..86850c71 100644
--- a/src/lms/ui/PlayQueueView.cpp
+++ b/src/lms/ui/PlayQueueView.cpp
@@ -163,13 +163,15 @@ PlayQueue::PlayQueue()
 void
 PlayQueue::updateRepeatBtn()
 {
-	_repeatBtn->toggleStyleClass("Lms-playqueue-btn-selected", _repeatAll);
+	_repeatBtn->toggleStyleClass("text-success", _repeatAll);
+	_repeatBtn->toggleStyleClass("text-muted", !_repeatAll);
 }
 
 void
 PlayQueue::updateRadioBtn()
 {
-	_radioBtn->toggleStyleClass("Lms-playqueue-btn-selected",_radioMode);
+	_radioBtn->toggleStyleClass("text-success",_radioMode);
+	_radioBtn->toggleStyleClass("text-muted", !_radioMode);
 }
 
 Database::TrackList::pointer