diff --git a/modules/slideshow/helpers/slideshow_block.php b/modules/slideshow/helpers/slideshow_block.php
index 66417eb1..f38f98a5 100644
--- a/modules/slideshow/helpers/slideshow_block.php
+++ b/modules/slideshow/helpers/slideshow_block.php
@@ -23,19 +23,18 @@ class slideshow_block_Core {
       "</script>";
   }
 
-  private static function _piclens_link() {
-    return "<a href=\"javascript:PicLensLite.start()\" id=\"gSlideshowLink\" " .
-      "class=\"gButtonLink\">" .
-      _("Slideshow") .
-      "</a>";
+  private static function _piclens_link($theme) {
+    return "<a href=\"javascript:PicLensLite.start()\" id=\"gSlideshowLink\">" . 
+      "<img src=\"" . $theme->url("images/ico-view-slideshow.png") . "\" alt=\"" . 
+      _("View slideshow") . "\" /></a>";
   }
 
   public static function album_top($theme) {
-    return self::_piclens_link();
+    return self::_piclens_link($theme);
   }
 
   public static function photo_top($theme) {
-    return self::_piclens_link();
+    return self::_piclens_link($theme);
   }
 
   public static function tag_top($theme) {
diff --git a/themes/default/views/album.html.php b/themes/default/views/album.html.php
index 8cc11b3e..4f8bf23e 100644
--- a/themes/default/views/album.html.php
+++ b/themes/default/views/album.html.php
@@ -1,10 +1,9 @@
 <? defined("SYSPATH") or die("No direct script access."); ?>
 <div id="gAlbumHeader">
   <ul id="gItemMenu">
-    <li><?= $theme->album_top() ?></li>
     <li><a href="#"><img src="<?= $theme->url("images/ico-view-album.png") ?>" alt="<?= _("View album") ?>" /></a></li>
     <li><a href="#"><img src="<?= $theme->url("images/ico-view-hybrid.png") ?>" alt="<?= _("View album in hybrid mode") ?>" /></a></li>
-    <li><a href="#"><img src="<?= $theme->url("images/ico-view-slideshow.png") ?>" alt="<?= _("View slideshow") ?>" /></a></li>
+    <li><?= $theme->album_top() ?></li>
     <li><a href="#" id="gAddItemLink" class="gButtonLink">v <?= _("Options") ?></a></li>
   </ul>
   <h1><?= $item->title_edit ?></h1>
diff --git a/themes/default/views/photo.html.php b/themes/default/views/photo.html.php
index 54188e7f..f58c51d1 100644
--- a/themes/default/views/photo.html.php
+++ b/themes/default/views/photo.html.php
@@ -1,11 +1,9 @@
 <? defined("SYSPATH") or die("No direct script access."); ?>
 <div id="gItemHeader">
   <ul id="gItemMenu">
-    <li><?= $theme->photo_top() ?></li>
     <li><a href="#"><img src="<?= $theme->url("images/ico-view-fullsize.png") ?>" alt="<?= sprintf(_("View full size image (%dx%d)"), $item->width, $item->height) ?>" /></a></li>
-    <li><a href="#"><img src="<?= $theme->url("images/ico-view-album.png") ?>" alt="<?= _("View album") ?>" /></a></li>
     <li><a href="#"><img src="<?= $theme->url("images/ico-view-hybrid.png") ?>" alt="<?= _("View album in hybrid mode") ?>" /></a></li>
-    <li><a href="#"><img src="<?= $theme->url("images/ico-view-slideshow.png") ?>" alt="<?= _("View slideshow") ?>" /></a></li>
+    <li><?= $theme->photo_top() ?></li>
     <li><a href="#" id="gAddItemLink" class="gButtonLink">v <?= _("Options") ?></a></li>
   </ul>
   <h1><?= $item->title_edit ?></h1>