diff --git a/picture.php b/picture.php
index 7bb52056e..6c16c713d 100644
--- a/picture.php
+++ b/picture.php
@@ -787,7 +787,7 @@ if (is_admin())
 }
 
 // favorite manipulation
-if (!is_a_guest())
+if (!is_a_guest() and $conf['picture_favorite_icon'])
 {
   // verify if the picture is already in the favorite of the user
   $query = '
diff --git a/themes/default/template/picture_nav_buttons.tpl b/themes/default/template/picture_nav_buttons.tpl
index f0e1300b5..c2a34eb5f 100644
--- a/themes/default/template/picture_nav_buttons.tpl
+++ b/themes/default/template/picture_nav_buttons.tpl
@@ -1,6 +1,6 @@
   <div class="navButtons">
 
-{if $DISPLAY_NAV_BUTTONS and !isset($slideshow)}
+{if $DISPLAY_NAV_BUTTONS or 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}