diff --git a/approot/mediaplayer.xml b/approot/mediaplayer.xml
index f03eb4e5..38e3a2fb 100644
--- a/approot/mediaplayer.xml
+++ b/approot/mediaplayer.xml
@@ -4,13 +4,13 @@
 
 <message id="Lms.MediaPlayer.template">
 	<audio id="lms-mp-audio"></audio>
-	<div id="lms-mp-previous"><i class="fa fa-step-backward fa-2x"></i></div>
-	<div id="lms-mp-play"><i class="fa fa-play fa-2x"></i></div>
-	<div id="lms-mp-pause" style="display: none"><i class="fa fa-pause fa-2x"></i></div>
-	<div id="lms-mp-next"><i class="fa fa-step-forward fa-2x"></i></div>
+	<i id="lms-mp-previous" class="fa fa-step-backward fa-2x"></i>
+	<i id="lms-mp-play" class="fa fa-play fa-2x"></i>
+	<i id="lms-mp-pause" class="fa fa-pause fa-2x" style="display: none"></i>
+	<i id="lms-mp-next" class="fa fa-step-forward fa-2x"></i>
 	${title}${artist}${release}
-	<div id="lms-mp-time">00:00</div>
-	<div id="lms-mp-duration">00:00</div>
+	<span id="lms-mp-time">00:00</span>
+	<span id="lms-mp-duration">00:00</span>
 	<img id="lms-mp-cover"/>
 </message>
 
diff --git a/docroot/js/mediaplayer.js b/docroot/js/mediaplayer.js
index fc430683..fb0b9e00 100644
--- a/docroot/js/mediaplayer.js
+++ b/docroot/js/mediaplayer.js
@@ -11,11 +11,11 @@ LMS.mediaplayer = function () {
 
 	var _updateControls = function() {
 		if (_elems.audio.paused) {
-			_elems.play.style.display = "block";
+			_elems.play.style.display = "inline";
 			_elems.pause.style.display = "none";
 		}
 		else {
-			_elems.pause.style.display = "block";
+			_elems.pause.style.display = "inline";
 			_elems.play.style.display = "none";
 		}
 	}
diff --git a/src/ui/MediaPlayer.cpp b/src/ui/MediaPlayer.cpp
index 758d4859..521888f2 100644
--- a/src/ui/MediaPlayer.cpp
+++ b/src/ui/MediaPlayer.cpp
@@ -83,12 +83,22 @@ MediaPlayer::playTrack(Database::IdType trackId)
 			_artist->setText(Wt::WString::fromUTF8(track->getArtist()->getName()));
 			_artist->setLink(LmsApp->createArtistLink(track->getArtist()));
 		}
+		else
+		{
+			_artist->setText("");
+			_artist->setLink(Wt::WLink());
+		}
 
 		if (track->getRelease())
 		{
 			_release->setText(Wt::WString::fromUTF8(track->getRelease()->getName()));
 			_release->setLink(LmsApp->createReleaseLink(track->getRelease()));
 		}
+		else
+		{
+			_release->setText("");
+			_release->setLink(Wt::WLink());
+		}
 
 		wApp->doJavaScript(oss.str());
 	}