diff --git a/approot/artists.xml b/approot/artists.xml
index 8119f94b..5d3f6b54 100644
--- a/approot/artists.xml
+++ b/approot/artists.xml
@@ -13,7 +13,11 @@
 		</div>
 	</div>
 	${artists}
-	${show-more}
+	<div class="row">
+		<div class="col-xs-12 Lms-horizontal-center">
+			${show-more class="btn-primary"}
+		</div>
+	</div>
 </message>
 
 <message id="Lms.Explore.Artists.template.entry">
diff --git a/approot/explore.xml b/approot/explore.xml
index 4857750a..655d7220 100644
--- a/approot/explore.xml
+++ b/approot/explore.xml
@@ -21,10 +21,6 @@
 	<i class="fa fa-play-circle Lms-explore-btn"></i>
 </message>
 
-<message id="Lms.Explore.template.show-more">
-	${tr:Lms.Explore.show-more}
-</message>
-
 <message id="Lms.Explore.template.filters">
 	<h3>${tr:Lms.Explore.filters} ${add-filter class="btn-primary"}</h3>
 	${clusters}
diff --git a/approot/playhistory.xml b/approot/playhistory.xml
index 6066fc84..a3494269 100644
--- a/approot/playhistory.xml
+++ b/approot/playhistory.xml
@@ -7,7 +7,11 @@
 		<h2>${tr:Lms.PlayHistory.playhistory}</h2>
 	</div>
 	${entries}
-	${show-more}
+	<div class="row">
+		<div class="col-xs-12 Lms-horizontal-center">
+			${show-more class="btn-primary"}
+		</div>
+	</div>
 </message>
 
 <message id="Lms.PlayHistory.template.entry">
diff --git a/approot/playqueue.xml b/approot/playqueue.xml
index 7d4b2c64..0f11e30b 100644
--- a/approot/playqueue.xml
+++ b/approot/playqueue.xml
@@ -19,15 +19,19 @@
 		${radio-mode}
 	</div>
 	${entries}
-	${show-more}
+	<div class="row">
+		<div class="col-xs-12 Lms-horizontal-center">
+			${show-more class="btn-primary"}
+		</div>
+	</div>
 </message>
 
 <message id="Lms.PlayQueue.play">
-	<i class="fa fa-play Lms-playqueue-btn"></i>
+	<i class="fa fa-play-circle Lms-playqueue-btn"></i>
 </message>
 
 <message id="Lms.PlayQueue.delete">
-	<i class="fa fa-remove Lms-playqueue-btn"></i>
+	<i class="fa fa-times-circle Lms-playqueue-btn"></i>
 </message>
 
 <message id="Lms.PlayQueue.template.entry">
diff --git a/approot/releases.xml b/approot/releases.xml
index 76f36933..7714aa27 100644
--- a/approot/releases.xml
+++ b/approot/releases.xml
@@ -13,7 +13,11 @@
 		</div>
 	</div>
 	${releases}
-	${show-more}
+	<div class="row">
+		<div class="col-xs-12 Lms-horizontal-center">
+			${show-more class="btn-primary"}
+		</div>
+	</div>
 </message>
 
 <message id="Lms.Explore.Releases.template.entry">
diff --git a/approot/tracks.xml b/approot/tracks.xml
index 46c647ae..66f73351 100644
--- a/approot/tracks.xml
+++ b/approot/tracks.xml
@@ -15,7 +15,11 @@
 		</div>
 	</div>
 	${tracks class="list-group"}
-	${show-more}
+	<div class="row">
+		<div class="col-xs-12 Lms-horizontal-center">
+			${show-more class="btn-primary"}
+		</div>
+	</div>
 </message>
 
 <message id="Lms.Explore.Tracks.template.entry">
diff --git a/docroot/css/lms.css b/docroot/css/lms.css
index 2609b560..b310fa0a 100644
--- a/docroot/css/lms.css
+++ b/docroot/css/lms.css
@@ -17,6 +17,12 @@ a:hover {
 	align-items: center;
 }
 
+.Lms-horizontal-center {
+	display: flex;
+	justify-content: center;
+}
+
+
 .Lms-cluster {
 	display: inline;
 	cursor: pointer;
diff --git a/src/ui/PlayHistoryView.cpp b/src/ui/PlayHistoryView.cpp
index a6859b07..ecdee58b 100644
--- a/src/ui/PlayHistoryView.cpp
+++ b/src/ui/PlayHistoryView.cpp
@@ -66,9 +66,7 @@ PlayHistory::PlayHistory()
 
 	_entriesContainer = bindNew<Wt::WContainerWidget>("entries");
 
-	// TODO move "Lms.Explore.show-more"
-	_showMore = bindNew<Wt::WTemplate>("show-more", Wt::WString::tr("Lms.Explore.show-more"));
-	_showMore->addFunction("tr", &Wt::WTemplate::Functions::tr);
+	_showMore = bindNew<Wt::WPushButton>("show-more", Wt::WString::tr("Lms.Explore.show-more"));
 	_showMore->setHidden(true);
 
 	_showMore->clicked().connect([=]
diff --git a/src/ui/PlayHistoryView.hpp b/src/ui/PlayHistoryView.hpp
index 5c2ee676..7bd5c88e 100644
--- a/src/ui/PlayHistoryView.hpp
+++ b/src/ui/PlayHistoryView.hpp
@@ -20,6 +20,7 @@
 #pragma once
 
 #include <Wt/WContainerWidget.h>
+#include <Wt/WPushButton.h>
 #include <Wt/WTemplate.h>
 
 #include "database/Types.hpp"
@@ -38,7 +39,7 @@ class PlayHistory : public Wt::WTemplate
 		void addSome();
 
 		Wt::WContainerWidget* _entriesContainer;
-		Wt::WTemplate* _showMore;
+		Wt::WPushButton* _showMore;
 };
 
 } // namespace UserInterface
diff --git a/src/ui/PlayQueueView.cpp b/src/ui/PlayQueueView.cpp
index c20d2506..b5eb0bbf 100644
--- a/src/ui/PlayQueueView.cpp
+++ b/src/ui/PlayQueueView.cpp
@@ -42,8 +42,7 @@ PlayQueue::PlayQueue()
 
 	_entriesContainer = bindNew<Wt::WContainerWidget>("entries");
 
-	_showMore = bindNew<Wt::WTemplate>("show-more", Wt::WString::tr("Lms.Explore.show-more"));
-	_showMore->addFunction("tr", &Wt::WTemplate::Functions::tr);
+	_showMore = bindNew<Wt::WPushButton>("show-more", Wt::WString::tr("Lms.Explore.show-more"));
 	_showMore->setHidden(true);
 
 	Wt::WText* shuffleBtn = bindNew<Wt::WText>("shuffle-btn", Wt::WString::tr("Lms.PlayQueue.shuffle"), Wt::TextFormat::XHTML);
diff --git a/src/ui/PlayQueueView.hpp b/src/ui/PlayQueueView.hpp
index e95eec41..7d0dacc8 100644
--- a/src/ui/PlayQueueView.hpp
+++ b/src/ui/PlayQueueView.hpp
@@ -21,6 +21,7 @@
 
 #include <Wt/WCheckBox.h>
 #include <Wt/WContainerWidget.h>
+#include <Wt/WPushButton.h>
 #include <Wt/WSignal.h>
 #include <Wt/WTemplate.h>
 #include <Wt/WText.h>
@@ -69,7 +70,7 @@ class PlayQueue : public Wt::WTemplate
 		boost::optional<Database::IdType> _tracklistId;
 		Wt::WCheckBox* _radioMode;
 		Wt::WContainerWidget* _entriesContainer;
-		Wt::WTemplate* _showMore;
+		Wt::WPushButton* _showMore;
 		Wt::WText* _nbTracks;
 		boost::optional<std::size_t> _trackPos;	// current track position, if set
 };
diff --git a/src/ui/explore/ArtistsView.cpp b/src/ui/explore/ArtistsView.cpp
index aa2ba77c..fadb2542 100644
--- a/src/ui/explore/ArtistsView.cpp
+++ b/src/ui/explore/ArtistsView.cpp
@@ -48,9 +48,7 @@ Artists::Artists(Filters* filters)
 
 	_container = bindNew<Wt::WContainerWidget>("artists");
 
-	_showMore = bindNew<Wt::WTemplate>("show-more", Wt::WString::tr("Lms.Explore.template.show-more"));
-	_showMore->addFunction("tr", &Wt::WTemplate::Functions::tr);
-
+	_showMore = bindNew<Wt::WPushButton>("show-more", Wt::WString::tr("Lms.Explore.show-more"));
 	_showMore->clicked().connect(std::bind([=]
 	{
 		addSome();
diff --git a/src/ui/explore/ArtistsView.hpp b/src/ui/explore/ArtistsView.hpp
index 6a54e934..afb965bc 100644
--- a/src/ui/explore/ArtistsView.hpp
+++ b/src/ui/explore/ArtistsView.hpp
@@ -20,8 +20,9 @@
 #pragma once
 
 #include <Wt/WContainerWidget.h>
-#include <Wt/WTemplate.h>
 #include <Wt/WLineEdit.h>
+#include <Wt/WPushButton.h>
+#include <Wt/WTemplate.h>
 #include <Wt/WSignal.h>
 
 #include "database/Types.hpp"
@@ -43,7 +44,7 @@ class Artists : public Wt::WTemplate
 		void addSome();
 
 		Filters* _filters;
-		Wt::WTemplate* _showMore;
+		Wt::WPushButton* _showMore;
 		Wt::WLineEdit* _search;
 		Wt::WContainerWidget* _container;
 };
diff --git a/src/ui/explore/ReleasesView.cpp b/src/ui/explore/ReleasesView.cpp
index ecf5dee7..defa1cc7 100644
--- a/src/ui/explore/ReleasesView.cpp
+++ b/src/ui/explore/ReleasesView.cpp
@@ -50,8 +50,7 @@ _filters(filters)
 
 	_container = bindNew<Wt::WContainerWidget>("releases");
 
-	_showMore = bindNew<Wt::WTemplate>("show-more", Wt::WString::tr("Lms.Explore.show-more"));
-	_showMore->addFunction("tr", &Wt::WTemplate::Functions::tr);
+	_showMore = bindNew<Wt::WPushButton>("show-more", Wt::WString::tr("Lms.Explore.show-more"));
 	_showMore->clicked().connect([=]
 	{
 		addSome();
diff --git a/src/ui/explore/ReleasesView.hpp b/src/ui/explore/ReleasesView.hpp
index da4cd227..b1cc979b 100644
--- a/src/ui/explore/ReleasesView.hpp
+++ b/src/ui/explore/ReleasesView.hpp
@@ -21,6 +21,7 @@
 
 #include <Wt/WContainerWidget.h>
 #include <Wt/WLineEdit.h>
+#include <Wt/WPushButton.h>
 #include <Wt/WTemplate.h>
 
 #include "database/Types.hpp"
@@ -42,7 +43,7 @@ class Releases : public Wt::WTemplate
 		void addSome();
 
 		Filters* _filters;
-		Wt::WTemplate* _showMore;
+		Wt::WPushButton* _showMore;
 		Wt::WLineEdit* _search;
 		Wt::WContainerWidget* _container;
 };
diff --git a/src/ui/explore/TracksView.cpp b/src/ui/explore/TracksView.cpp
index c5d0621a..dd177ba0 100644
--- a/src/ui/explore/TracksView.cpp
+++ b/src/ui/explore/TracksView.cpp
@@ -66,8 +66,7 @@ _filters(filters)
 
 	_tracksContainer = bindNew<Wt::WContainerWidget>("tracks");
 
-	_showMore = bindNew<Wt::WTemplate>("show-more", Wt::WString::tr("Lms.Explore.template.show-more"));
-	_showMore->addFunction("tr", &Wt::WTemplate::Functions::tr);
+	_showMore = bindNew<Wt::WPushButton>("show-more", Wt::WString::tr("Lms.Explore.show-more"));
 	_showMore->clicked().connect(std::bind([=]
 	{
 		addSome();
diff --git a/src/ui/explore/TracksView.hpp b/src/ui/explore/TracksView.hpp
index f5b13d8c..d8bc9a3d 100644
--- a/src/ui/explore/TracksView.hpp
+++ b/src/ui/explore/TracksView.hpp
@@ -21,6 +21,7 @@
 
 #include <Wt/WContainerWidget.h>
 #include <Wt/WLineEdit.h>
+#include <Wt/WPushButton.h>
 #include <Wt/WTemplate.h>
 
 #include "database/Types.hpp"
@@ -48,7 +49,7 @@ class Tracks : public Wt::WTemplate
 		std::vector<Database::Track::pointer> getTracks();
 
 		Wt::WContainerWidget* _tracksContainer;
-		Wt::WTemplate* _showMore;
+		Wt::WPushButton* _showMore;
 		Wt::WLineEdit* _search;
 		Filters* _filters;
 };