diff --git a/templates/show_random_albums.inc.php b/templates/show_random_albums.inc.php
index 8a3292f5..d58e804b 100644
--- a/templates/show_random_albums.inc.php
+++ b/templates/show_random_albums.inc.php
@@ -32,13 +32,24 @@ if ($albums) {
         $name = '[' . $album->f_artist . '] ' . scrub_out($album->full_name);
     ?>
     <div class="random_album">
-        <a href="<?php echo $web_path; ?>/albums.php?action=show&amp;album=<?php echo $album_id; ?>">
-        <?php if (Art::is_enabled()) { ?>
-                <img src="<?php echo $web_path; ?>/image.php?thumb=3&amp;id=<?php echo $album_id; ?>" width="80" height="80" alt="<?php echo $name; ?>" title="<?php echo $name; ?>" />
-        <?php } else { ?>
-            <?php echo '[' . $album->f_artist . '] ' . $album->f_name; ?>
+        <div class="art_album">
+            <a href="<?php echo $web_path; ?>/albums.php?action=show&amp;album=<?php echo $album_id; ?>">
+            <?php if (Art::is_enabled()) { ?>
+                    <img src="<?php echo $web_path; ?>/image.php?thumb=3&amp;id=<?php echo $album_id; ?>" alt="<?php echo $name; ?>" title="<?php echo $name; ?>" />
+            <?php } else { ?>
+                <?php echo '[' . $album->f_artist . '] ' . $album->f_name; ?>
+            <?php } ?>
+            </a>
+        </div>
+        <div class="play_album">
+        <?php if (AmpConfig::get('directplay')) { ?>
+            <?php echo Ajax::button('?page=stream&action=directplay&playtype=album&album_id=' . $album->id,'play', T_('Play'),'play_album_' . $album->id); ?>
+            <?php if (Stream_Playlist::check_autoplay_append()) { ?>
+                <?php echo Ajax::button('?page=stream&action=directplay&playtype=album&album_id=' . $album->id . '&append=true','play_add', T_('Play last'),'addplay_album_' . $album->id); ?>
+            <?php } ?>
         <?php } ?>
-        </a>
+        <?php echo Ajax::button('?action=basket&type=album&id=' . $album->id,'add', T_('Add to temporary playlist'),'play_full_' . $album->id); ?>
+        </div>
         <?php
         if (AmpConfig::get('ratings')) {
             echo "<div id=\"rating_" . $album->id . "_album\">";
@@ -46,7 +57,6 @@ if ($albums) {
             echo "</div>";
         }
         ?>
-        <span class="play_album"><?php echo Ajax::button('?action=basket&type=album&id=' . $album->id,'add', T_('Play Album'),'play_full_' . $album->id); ?></span>
     </div>
     <?php } ?>
 <?php } ?>
diff --git a/themes/reborn/templates/default.css b/themes/reborn/templates/default.css
index bfa21ed0..85d7a86f 100644
--- a/themes/reborn/templates/default.css
+++ b/themes/reborn/templates/default.css
@@ -1201,11 +1201,7 @@ div.box.box_current_configuration {
     text-align: center;
 }
 
-#random_selection .random_album div {
-    display: inline;
-}
-
-#random_selection .random_album img {
+#random_selection .art_album img {
     vertical-align: middle;
     -webkit-border-radius: 2px;
     -moz-border-radius: 2px;
@@ -1213,25 +1209,27 @@ div.box.box_current_configuration {
     -webkit-box-shadow: 0 0 10px rgba(0,0,0,0.75);
     -moz-box-shadow: 0 0 10px rgba(0,0,0,0.75);
     box-shadow: 0 0 10px rgba(0,0,0,0.75);
+    width: 80px;
+    height: 80px;
     margin: 2px;
 }
 
-#random_selection .random_album img:hover {
+#random_selection .art_album img:hover {
     border: 2px solid #ff9d00;
     margin: 0px;
 }
 
 #random_selection .random_album .star-rating {
-    float: left;
+    margin: auto;
 }
 
 #random_selection .random_album .play_album {
-    float: left;
     margin-left: 7px;
 }
 
-#random_selection .random_album .play_album a img {
-    border: 0px;
+#random_selection .random_album .play_album img {
+    border: 0;
+    box-shadow: 0 0 0 0;
 }
 
 #random_selection .box-bottom {