diff --git a/themes/default/template/picture.tpl b/themes/default/template/picture.tpl
index 0759d14d4..f64e04856 100644
--- a/themes/default/template/picture.tpl
+++ b/themes/default/template/picture.tpl
@@ -133,7 +133,7 @@ y.callService(
 				<img src="{$previous.derivatives.square->get_url()}" alt="{$previous.TITLE_ESC}">
 			</a>
 		{elseif isset($U_UP)}
-			<a class="navThumb" id="linkFirst" href="{$U_UP}" title="{'Thumbnails'|@translate}" rel="prev">
+			<a class="navThumb" id="linkPrev" href="{$U_UP}" title="{'Thumbnails'|@translate}">
 				<div class="thumbHover">{'First Page'|@translate}<br><br>{'Go back to the album'|@translate}</div>
 			</a>
 		{/if}
@@ -143,7 +143,7 @@ y.callService(
 				<img src="{$next.derivatives.square->get_url()}" alt="{$next.TITLE_ESC}">
 			</a>
 		{elseif isset($U_UP)}
-			<a class="navThumb" id="linkLast"  href="{$U_UP}"  title="{'Thumbnails'|@translate}" rel="next">
+			<a class="navThumb" id="linkNext"  href="{$U_UP}"  title="{'Thumbnails'|@translate}">
 				<div class="thumbHover">{'Last Page'|@translate}<br><br>{'Go back to the album'|@translate}</div>
 			</a>
 		{/if}
diff --git a/themes/default/theme.css b/themes/default/theme.css
index e1fcfe4af..f787090bf 100644
--- a/themes/default/theme.css
+++ b/themes/default/theme.css
@@ -387,27 +387,24 @@ TD.calDayCellFull, TD.calDayCellEmpty {
 	min-height: 120px;
 }
 
-#linkPrev, #linkFirst {
+#linkPrev {
 	float: left;
 	margin: 5px 10px 0 5px;
 }
 
-#linkNext, #linkLast {
+#linkNext {
 	float: right;
 	margin: 5px 5px 0 10px;
   text-align: right;
 }
 
-#linkFirst, #linkLast {
-  border: 1px solid #ccc;
-}
 
-#linkFirst div, #linkLast div {
-  display: inline-block;
+DIV.thumbHover{ /*only first & last holders are divs*/
   width: 108px;
 	height: 118px;
+	border: 1px solid gray;
+	padding: 0 5px;
   line-height: 1.2;
-  margin: 0 5px;
 }
 
 .imageInfoTable UL { /*this is the album list*/
diff --git a/themes/elegant/theme.css b/themes/elegant/theme.css
index e5b046cbd..0c247e0a7 100644
--- a/themes/elegant/theme.css
+++ b/themes/elegant/theme.css
@@ -223,7 +223,6 @@ a:hover 		{ border-bottom: none;}
 #imageInfos .navThumb 				{ position: relative; margin: 0; overflow: hidden;}
 #imageInfos #linkPrev 				{ float: left;}
 #imageInfos #linkNext			  	{ float: right;}
-#imageInfos #linkFirst, #imageInfos #linkLast { border-color: #444444;}
 #imageInfos .prevThumbHover 			{ background: transparent url(icon/none.png) no-repeat center center;}
 #imageInfos .prevThumbHover:hover 	{ background: transparent url(icon/img_prev.png) no-repeat center center;}
 #imageInfos .nextThumbHover 			{ background: transparent url(icon/none.png) no-repeat center center;}