diff --git a/picture.php b/picture.php
index 26e461daf..052d9c325 100644
--- a/picture.php
+++ b/picture.php
@@ -633,7 +633,7 @@ else
       )
     );
   $template->assign_block_vars(
-    'thumbnails',array('U_UP' => $url_up));
+    'up',array('U_URL' => $url_up));
 }
 
 $template->assign_vars(
diff --git a/template/yoga/header.tpl b/template/yoga/header.tpl
index cc2353c2a..19e9e755d 100644
--- a/template/yoga/header.tpl
+++ b/template/yoga/header.tpl
@@ -16,7 +16,6 @@
 <link rel="search" title="{lang:search}" href="{pwg_root}search.php" >
 <!-- BEGIN first -->
 <link rel="first" title="{lang:first_page}" href="{first.U_IMG}" >
-<link rel="up" title="{lang:thumbnails}" href="{U_UP}" >
 <!-- END first -->
 <!-- BEGIN previous -->
 <link rel="prev" title="{lang:previous_page}" href="{previous.U_IMG}" >
@@ -26,8 +25,10 @@
 <!-- END next -->
 <!-- BEGIN last -->
 <link rel="last" title="{lang:last_page}" href="{last.U_IMG}" >
-<link rel="up" title="{lang:thumbnails}" href="{U_UP}" >
 <!-- END last -->
+<!-- BEGIN up -->
+<link rel="up" title="{lang:thumbnails}" href="{up.U_URL}" >
+<!-- END up -->
 <link rel="stylesheet" type="text/css" href="{pwg_root}template/{themeconf:template}/layout.css">
 <!-- the next css is used to fix khtml (Konqueror/Safari) issue
 the "text/nonsense" prevents gecko based browsers to load it -->
diff --git a/template/yoga/picture_nav_buttons.tpl b/template/yoga/picture_nav_buttons.tpl
index e2d1d70de..4041f7b42 100644
--- a/template/yoga/picture_nav_buttons.tpl
+++ b/template/yoga/picture_nav_buttons.tpl
@@ -19,9 +19,9 @@
   <!-- BEGIN stop_play -->
     <a class="navButton play" href="{stop_play.U_IMG}" title="{lang:stop_play}" rel="play"><img src="{pwg_root}{themeconf:icon_dir}/pause.png" class="button" alt="{lang:stop_play}"></a>
   <!-- END stop_play -->
-  <!-- BEGIN thumbnails -->
-    <a class="navButton up" href="{thumbnails.U_UP}" title="{lang:thumbnails}" rel="up"><img src="{pwg_root}{themeconf:icon_dir}/up.png" class="button" alt="{lang:thumbnails}"></a>
-  <!-- END thumbnails -->
+  <!-- BEGIN up -->
+    <a class="navButton up" href="{up.U_URL}" title="{lang:thumbnails}" rel="up"><img src="{pwg_root}{themeconf:icon_dir}/up.png" class="button" alt="{lang:thumbnails}"></a>
+  <!-- END up -->
   <!-- BEGIN previous -->
     <a class="navButton prev" href="{previous.U_IMG}" title="{lang:previous_page} : {previous.TITLE_IMG}" rel="prev"><img src="{pwg_root}{themeconf:icon_dir}/left.png" class="button" alt="{lang:previous_page}"></a>
   <!-- END previous -->
@@ -76,9 +76,9 @@ function keyboardNavigation(e)
 <!-- BEGIN last -->
     /*End*/case 35: if (e.ctrlKey){window.location="{last.U_IMG}".replace("&amp;","&"); return false; } break;
 <!-- END last -->
-<!-- BEGIN thumbnails -->
-    /*Up*/case 38: if (e.ctrlKey){window.location="{thumbnails.U_UP}".replace("&amp;","&"); return false; } break;
-<!-- END thumbnails -->
+<!-- BEGIN up -->
+    /*Up*/case 38: if (e.ctrlKey){window.location="{up.U_UP}".replace("&amp;","&"); return false; } break;
+<!-- END up -->
 <!-- BEGIN start_play -->
     /*Pause*/case 32: {window.location="{start_play.U_IMG}".replace("&amp;","&"); return false; } break;
 <!-- END start_play -->