diff --git a/themes/default/css/screen.css b/themes/default/css/screen.css
index 49824a05..aad2ee8d 100644
--- a/themes/default/css/screen.css
+++ b/themes/default/css/screen.css
@@ -299,6 +299,10 @@ table.gBlockContent td {
 
 /* Album ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
+#gAlbumHeader {
+  position: relative;
+}
+
 #gAlbumHeader h1 {
   display: inline;
   margin-right: .6em;
@@ -309,10 +313,6 @@ table.gBlockContent td {
   display: inline;
 }
 
-#gAlbumHeaderButtons {
-  float: right;
-}
-
 #gAlbumGrid {
 	margin-top: 20px;
 }
@@ -492,6 +492,18 @@ table.gMetadata td.toggle {
   width: 100%;
 }
 
+#gItemMenu {
+  margin: 0 0 20px 20px;
+  position: absolute;
+  right: 0;
+  top: 0;
+}
+
+#gItemMenu li {
+  float: left;
+  margin: 0 3px;
+}
+
 /* Breadcrumbs ~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 #gBreadcrumbs {
@@ -656,8 +668,10 @@ table.gMetadata td.toggle {
 
 .gButtonLink {
   border: 1px solid #ccc;
-  padding: 5px;
-  margin-left: 5px;
+  display: block;
+  height: 24px;
+  line-height: 1.7em;
+  padding: 3px 1em 0;
 }
 
 .gButtonLink:hover {
diff --git a/themes/default/images/ico-view-album.png b/themes/default/images/ico-view-album.png
new file mode 100644
index 00000000..328850a7
Binary files /dev/null and b/themes/default/images/ico-view-album.png differ
diff --git a/themes/default/images/ico-view-fullsize.png b/themes/default/images/ico-view-fullsize.png
new file mode 100644
index 00000000..9d9b0e45
Binary files /dev/null and b/themes/default/images/ico-view-fullsize.png differ
diff --git a/themes/default/images/ico-view-hybrid.png b/themes/default/images/ico-view-hybrid.png
new file mode 100644
index 00000000..daa565fb
Binary files /dev/null and b/themes/default/images/ico-view-hybrid.png differ
diff --git a/themes/default/images/ico-view-slideshow.png b/themes/default/images/ico-view-slideshow.png
new file mode 100644
index 00000000..caef9136
Binary files /dev/null and b/themes/default/images/ico-view-slideshow.png differ
diff --git a/themes/default/views/album.html.php b/themes/default/views/album.html.php
index ac02ba6e..8cc11b3e 100644
--- a/themes/default/views/album.html.php
+++ b/themes/default/views/album.html.php
@@ -1,8 +1,12 @@
 <? defined("SYSPATH") or die("No direct script access."); ?>
 <div id="gAlbumHeader">
-  <div id="gAlbumHeaderButtons">
-    <?= $theme->album_top() ?>
-  </div>
+  <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><a href="#" id="gAddItemLink" class="gButtonLink">v <?= _("Options") ?></a></li>
+  </ul>
   <h1><?= $item->title_edit ?></h1>
   <div class="gDescription"><?= $item->description_edit ?></div>
 </div>
diff --git a/themes/default/views/photo.html.php b/themes/default/views/photo.html.php
index 6ac30d86..54188e7f 100644
--- a/themes/default/views/photo.html.php
+++ b/themes/default/views/photo.html.php
@@ -1,18 +1,20 @@
 <? defined("SYSPATH") or die("No direct script access."); ?>
 <div id="gItemHeader">
-  <div id="gItemHeaderButtons">
-    <a href="" class="gButtonLink">
-      <?= sprintf(_("Full size (%dx%d)"), $item->width, $item->height) ?>
-    </a>
-    <?= $theme->photo_top() ?>
-  </div>
+  <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><a href="#" id="gAddItemLink" class="gButtonLink">v <?= _("Options") ?></a></li>
+  </ul>
+  <h1><?= $item->title_edit ?></h1>
 </div>
 
 <div id="gItem">
   <img id="gPhotoID-<?= $item->id ?>" alt="photo" src="<?= $item->resize_url() ?>"
        width="<?= $item->resize_width ?>"
        height="<?= $item->resize_height ?>" />
-  <h1><?= $item->title_edit ?></h1>
   <div><?= $item->description_edit ?></div>
 
   <?= $theme->photo_bottom() ?>