2 files changed, 7 insertions, 1 deletions
diff --git a/themes/default/template/picture.tpl b/themes/default/template/picture.tpl
index e5dd470e9..84dd8e43f 100644
--- a/themes/default/template/picture.tpl
+++ b/themes/default/template/picture.tpl
@@ -46,7 +46,9 @@
     {if isset($U_SLIDESHOW_STOP) }
       <a href="{$U_SLIDESHOW_STOP}" title="{'stop the slideshow'|@translate}" rel="nofollow"><img src="{$ROOT_URL}{$themeconf.icon_dir}/stop_slideshow.png" class="button" alt="{'stop the slideshow'|@translate}"></a>
     {/if}
+    {if isset($U_METADATA) }
       <a href="{$U_METADATA}" title="{'Show file metadata'|@translate}" rel="nofollow"><img src="{$ROOT_URL}{$themeconf.icon_dir}/metadata.png" class="button" alt="metadata"></a>
+    {/if}
     {if isset($current.U_DOWNLOAD) }
       <a href="{$current.U_DOWNLOAD}" title="{'download'|@translate}"><img src="{$ROOT_URL}{$themeconf.icon_dir}/save.png" class="button" alt="{'download'|@translate}"></a>
     {/if}
@@ -98,6 +100,7 @@ y.callService(
 
 </div>
 
+{if $DISPLAY_NAV_THUMB}
 {if isset($previous) }
 <a class="navThumb" id="linkPrev" href="{$previous.U_IMG}" title="{'Previous'|@translate} : {$previous.TITLE}" rel="prev">
   <img src="{$previous.THUMB_SRC}" alt="{$previous.TITLE}">
@@ -108,6 +111,7 @@ y.callService(
   <img src="{$next.THUMB_SRC}" alt="{$next.TITLE}">
 </a>
 {/if}
+{/if}
 
 <table id="standard" class="infoTable" summary="{'Some info about this picture'|@translate}">
   <tr id="Author">
diff --git a/themes/default/template/picture_nav_buttons.tpl b/themes/default/template/picture_nav_buttons.tpl
index 06b236a88..f0e1300b5 100644
--- a/themes/default/template/picture_nav_buttons.tpl
+++ b/themes/default/template/picture_nav_buttons.tpl
@@ -1,5 +1,6 @@
   <div class="navButtons">
-  
+
+{if $DISPLAY_NAV_BUTTONS and !isset($slideshow)}
 {if isset($last)}
   <a class="navButton" href="{$last.U_IMG}" title="{'Last'|@translate} : {$last.TITLE}" rel="last"><img src="{$ROOT_URL}{$themeconf.icon_dir}/last.png" class="button" alt="{'Last'|@translate}"></a>
 {else}
@@ -58,6 +59,7 @@
     <a class="navButton"> <img src="{$ROOT_URL}{$themeconf.icon_dir}/inc_period_unactive.png" class="button" alt=""></a>
   {/if}
 {/if}
+{/if}
 
   </div>