diff --git a/koha-tmpl/opac-tmpl/default/en/includes/members-top.inc b/koha-tmpl/opac-tmpl/default/en/includes/members-top.inc
index 30c823ac2e..88d97ac6fc 100644
--- a/koha-tmpl/opac-tmpl/default/en/includes/members-top.inc
+++ b/koha-tmpl/opac-tmpl/default/en/includes/members-top.inc
@@ -27,23 +27,23 @@ marginheight=0 marginwidth=0 leftmargin=0 topmargin=0 >
 <table cellpadding=0 cellspacing=0 width="100%" border=0>
 <tr BGCOLOR="#339999" >
 
-        <td valign=bottom><img src="../images/inside-top-member.gif" 
+        <td valign=bottom><img src="<TMPL_VAR NAME='themelang'>/images/inside-top-member.gif" 
 	width=353 height=50 alt="KOHA: Members Area" hspace=0 vspace=0 border=0></td>
 
-        <td align=right><a href="/cat/" 		onMouseOver="document.mouseover.src='/images/mouseover-search.gif'" 		onMouseOut="document.mouseover.src='/images/holder.gif'"><img 
-	src="../images/menu-search.gif" 
+        <td align=right><a href="/cgi-bin/koha/opac-search.pl" 		onMouseOver="document.mouseover.src='<TMPL_VAR NAME='themelang'>/images/mouseover-search.gif'" 		onMouseOut="document.mouseover.src='/images/holder.gif'"><img 
+	src="<TMPL_VAR NAME='themelang'>/images/menu-search.gif" 
 	width=71 height=30 alt="Search" hspace=0 vspace=0 border=0 name="menu-search"></a>
 	
-	<a href="/members/"
-	onMouseOver="document.mouseover.src='/images/mouseover-member.gif'" 			onMouseOut="document.mouseover.src='/images/holder.gif'"><img src="/images/menu-login.gif" 
+	<a href="/cgi-bin/koha/opac-user.pl"
+	onMouseOver="document.mouseover.src='<TMPL_VAR NAME='themelang'>/images/mouseover-member.gif'" 			onMouseOut="document.mouseover.src='<TMPL_VAR NAME='themelang'>/images/holder.gif'"><img src="<TMPL_VAR NAME='themelang'>/images/menu-login.gif" 
 	width=111 height=30 alt="Member Login" hspace=0 vspace=0 border=0 name="menu-login"></a>
 
 	<a href="/join.html"
-	onMouseOver="document.mouseover.src='/images/mouseover-join.gif'" 		onMouseOut="document.mouseover.src='/images/holder.gif'"><img src="/images/menu-join.gif" 
+	onMouseOver="document.mouseover.src='<TMPL_VAR NAME='themelang'>/images/mouseover-join.gif'" 		onMouseOut="document.mouseover.src='<TMPL_VAR NAME='themelang'>/images/holder.gif'"><img src="<TMPL_VAR NAME='themelang'>/images/menu-join.gif" 
 	width=54 height=30 alt="Join" hspace=0 vspace=0 border=0 name="menu-join"></a>
 
-	<a href="/index.html" 
-	onMouseOver="document.mouseover.src='/images/mouseover-home.gif'" 		onMouseOut="document.mouseover.src='/images/holder.gif'"><img src="/images/menu-home.gif" 
+	<a href="/cgi-bin/koha/opac-main.pl" 
+	onMouseOver="document.mouseover.src='<TMPL_VAR NAME='themelang'>/images/mouseover-home.gif'" 		onMouseOut="document.mouseover.src='<TMPL_VAR NAME='themelang'>/images/holder.gif'"><img src="<TMPL_VAR NAME='themelang'>/images/menu-home.gif" 
 	width=60 height=30 alt="Home" hspace=0 vspace=0 border=0 name="menu-home"></a></td>
         
         </TR>
@@ -51,10 +51,10 @@ marginheight=0 marginwidth=0 leftmargin=0 topmargin=0 >
 
 <tr valign=top>
 
-        <td><img src="/images/inside-koha-bottom.gif" 
+        <td><img src="<TMPL_VAR NAME='themelang'>/images/inside-koha-bottom.gif" 
 	width=69 height=44 alt="KOHA" hspace=0 vspace=0 border=0 ></td>
 
-        <td align=right><img src="/images/holder.gif" 
+        <td align=right><img src="<TMPL_VAR NAME='themelang'>/images/holder.gif" 
 	width=300 height=48 alt="" hspace=0 vspace=0 name="mouseover" ></a></td>
 
         </TR>
diff --git a/koha-tmpl/opac-tmpl/default/en/includes/opac-bottom.inc b/koha-tmpl/opac-tmpl/default/en/includes/opac-bottom.inc
index 4e1c0fab45..7b27c4a8b1 100644
--- a/koha-tmpl/opac-tmpl/default/en/includes/opac-bottom.inc
+++ b/koha-tmpl/opac-tmpl/default/en/includes/opac-bottom.inc
@@ -5,11 +5,11 @@
 <center>
 
 
-<A HREF="./opacsearch.pl">Catalogue Search</a> || 
+<A HREF="/cgi-bin/koha/opac-search.pl">Catalogue Search</a> || 
 <!--<A HREF="/members/">Member Login</a> || 
 -->
-<A HREF="./join.html">Become a Member</a> || 
-<A HREF="./opacmain.pl">Home</a> 
+<A HREF="/cgi-bin/koha/join.html">Become a Member</a> || 
+<A HREF="/cgi-bin/koha/opac-main.pl">Home</a> 
 
 </font>
 </center>
diff --git a/koha-tmpl/opac-tmpl/default/en/includes/opac-top.inc b/koha-tmpl/opac-tmpl/default/en/includes/opac-top.inc
index ff4e49022b..bd175ef750 100644
--- a/koha-tmpl/opac-tmpl/default/en/includes/opac-top.inc
+++ b/koha-tmpl/opac-tmpl/default/en/includes/opac-top.inc
@@ -32,7 +32,7 @@ marginheight=0 marginwidth=0 leftmargin=0 topmargin=0 >
 
 
       
-        <td align=right><a href="./opacsearch.pl" 		onMouseOver="document.mouseover.src='<TMPL_VAR NAME='themelang'>/images/mouseover-search.gif'" 		onMouseOut="document.mouseover.src='<TMPL_VAR NAME='themelang'>/images/holder.gif'"><img 
+        <td align=right><a href="/cgi-bin/koha/opac-search.pl" 		onMouseOver="document.mouseover.src='<TMPL_VAR NAME='themelang'>/images/mouseover-search.gif'" 		onMouseOut="document.mouseover.src='<TMPL_VAR NAME='themelang'>/images/holder.gif'"><img 
 	src="<TMPL_VAR NAME='themelang'>/images/menu-search.gif" 
 	width=71 height=30 alt="Search" hspace=0 vspace=0 border=0 name="menu-search"></a>
 	
@@ -40,11 +40,11 @@ marginheight=0 marginwidth=0 leftmargin=0 topmargin=0 >
 	onMouseOver="document.mouseover.src='<TMPL_VAR NAME='themelang'>/images/mouseover-member.gif'" 			onMouseOut="document.mouseover.src='<TMPL_VAR NAME='themelang'>/images/holder.gif'"><img src="<TMPL_VAR NAME='themelang'>/images/menu-login.gif" 
 	width=111 height=30 alt="Member Login" hspace=0 vspace=0 border=0 name="menu-login"></a>
 -->
-	<a href="/join.html"
+	<a href="/cgi-bin/koha/join.html"
 	onMouseOver="document.mouseover.src='<TMPL_VAR NAME='themelang'>/images/mouseover-join.gif'" 		onMouseOut="document.mouseover.src='<TMPL_VAR NAME='themelang'>/images/holder.gif'"><img src="<TMPL_VAR NAME='themelang'>/images/menu-join.gif" 
 	width=54 height=30 alt="Join" hspace=0 vspace=0 border=0 name="menu-join"></a>
 
-	<a href="/" 
+	<a href="/cgi-bin/koha/opac-main.pl" 
 	onMouseOver="document.mouseover.src='<TMPL_VAR NAME='themelang'>/images/mouseover-home.gif'" 		onMouseOut="document.mouseover.src='<TMPL_VAR NAME='themelang'>/images/holder.gif'"><img src="<TMPL_VAR NAME='themelang'>/images/menu-home.gif" 
 	width=60 height=30 alt="Home" hspace=0 vspace=0 border=0 name="menu-home"></a></td>