diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/alt_menu-serials.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/alt_menu-serials.inc
deleted file mode 100644
index 9e6dffc549..0000000000
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/alt_menu-serials.inc
+++ /dev/null
@@ -1,6 +0,0 @@
-    <p>
-         <a href="/cgi-bin/koha/serials/serials-home.pl">Search/Add Subscription</a>
-         <a href="/cgi-bin/koha/serials/serials-home.pl?routing=1">Create/Edit Routing List</a>
-         <a href="/cgi-bin/koha/serials/lateissues.pl">Late Issues</a>
-	 <a href="/cgi-bin/koha/serials/claims.pl">Claims</a>
-    </p>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/menu-acqui.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/menu-acqui.inc
deleted file mode 100644
index 8198b1ff80..0000000000
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/menu-acqui.inc
+++ /dev/null
@@ -1,9 +0,0 @@
-<div id="submenu">
-<ul>
-	<li>    <a href="/cgi-bin/koha/acqui/supplier.pl?op=enter">Add supplier</a></li>
-	<li>    <a href="/cgi-bin/koha/acqui/lateorders.pl">Late orders</a></li>
-	<li>    <a href="/cgi-bin/koha/acqui/histsearch.pl">History search</a></li>
-	<li>    <a href="/cgi-bin/koha/suggestion/acceptorreject.pl?op=aorr_confirm">Manage suggestions</a></li>
-	<li>    <a href="/cgi-bin/koha/admin/aqbookfund.pl">Parameters</a></li>
-</ul>
-</div>
\ No newline at end of file
diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/menu-admin.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/menu-admin.inc
deleted file mode 100644
index 88ed031767..0000000000
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/menu-admin.inc
+++ /dev/null
@@ -1,18 +0,0 @@
-<div id="submenu">
-    <p>
-<ul>
-	<li>        <a href="/cgi-bin/koha/admin/branches.pl">Libraries</a></li>
-	<li>        <a href="/cgi-bin/koha/admin/aqbookfund.pl">Funds</a></li>
-	<li>        <a href="/cgi-bin/koha/admin/itemtypes.pl">Item types</a></li>
-	<li>        <a href="/cgi-bin/koha/admin/categorie.pl">Patron types and categories</a></li>
-	<li>        <a href="/cgi-bin/koha/admin/issuingrules.pl">Issuing rules</a></li>
-</ul>
-    </p>
-    <p>
-<ul>
-	<li>        <a href="/cgi-bin/koha/admin/biblio_framework.pl">Biblio Framework</a></li>
-	<li>        <a href="/cgi-bin/koha/admin/authtypes.pl">Thesaurus Framework</a></li>
-	<li>        <a href="/cgi-bin/koha/admin/authorised_values.pl">Authorised values</a></li>
-</ul>
-    </p>
-</div>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/menu-catalogue.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/menu-catalogue.inc
deleted file mode 100644
index 0f8fef5b97..0000000000
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/menu-catalogue.inc
+++ /dev/null
@@ -1,5 +0,0 @@
-<div id="submenu">
-<ul>
-	<li>    <a href="/cgi-bin/koha/reviews/reviewswaiting.pl">Manage reviews</a></li>
-</ul>
-</div>
\ No newline at end of file
diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/menu-circ.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/menu-circ.inc
deleted file mode 100644
index 889182ef88..0000000000
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/menu-circ.inc
+++ /dev/null
@@ -1,12 +0,0 @@
-<div id="submenu">
-<ul>
-	<li>    <a href="/cgi-bin/koha/circ/selectbranchprinter.pl">Set library</a></li>
-	<li>    <a href="/cgi-bin/koha/circ/pendingreserves.pl" title="holds to retrieve off the shelf">Holds to pull</a></li>
-	<li>    <a href="/cgi-bin/koha/circ/waitingreserves.pl" title="holds waiting for patron pickup">Holds awaiting pickup</a></li>
-	<li>    <a href="/cgi-bin/koha/circ/transferstodo.pl" title="transfers to do from your library">Transfers to do</a></li>
-	<li>    <a href="/cgi-bin/koha/circ/transferstoreceive.pl" title="transfers to receive at your library">Transfers to receive</a></li>
-	<li>    <a href="/cgi-bin/koha/circ/overdue.pl">Overdues</a></li>
-	<li>    <a href="/cgi-bin/koha/circ/branchoverdues.pl">Fines</a></li>
-	<li>    <a href="/cgi-bin/koha/circ/stats.pl?time=yesterday">Daily reconciliation</a></li>
-</ul>
-</div>
\ No newline at end of file
diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/menu-labels.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/menu-labels.inc
deleted file mode 100755
index 2a2d1007f6..0000000000
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/menu-labels.inc
+++ /dev/null
@@ -1,7 +0,0 @@
-<div id="submenu">
-<ul>
-	<li><a href="/cgi-bin/koha/labels/label-home.pl">Label Layouts</a></li>
-	<li><a href="/cgi-bin/koha/labels/label-templates.pl">Label Templates</a></li>
-	<li><a href="/cgi-bin/koha/labels/label-manager.pl">Create or Print Label Batches</a></li>
-</ul>
-</div>
\ No newline at end of file
diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/menu-members.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/menu-members.inc
deleted file mode 100644
index 7bfd88b3d5..0000000000
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/menu-members.inc
+++ /dev/null
@@ -1,8 +0,0 @@
-<div id="submenu">
-<ul>
-	<li>    <a href="/cgi-bin/koha/members/memberentry.pl?op=add&amp;category_type=A">Add adult</a></li>
-	<li>    <a href="/cgi-bin/koha/members/memberentry.pl?op=add&amp;category_type=C">Add child</a></li>
-	<li>    <a href="/cgi-bin/koha/members/memberentry.pl?op=add&amp;category_type=P">Add professional</a></li>
-	<li>    <a href="/cgi-bin/koha/members/memberentry.pl?op=add&amp;category_type=I">Add organisation</a></li>
-</ul>
-</div>
\ No newline at end of file
diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/menu-reports.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/menu-reports.inc
deleted file mode 100644
index 87ed7f8d5c..0000000000
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/menu-reports.inc
+++ /dev/null
@@ -1,5 +0,0 @@
-<div id="submenu">
-<ul>
-	<li>        <a href="/cgi-bin/koha/reports/reports-home.pl">home</a></li>
-</ul>
-</div>
\ No newline at end of file
diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/menu-reviews.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/menu-reviews.inc
deleted file mode 100644
index 5e3921118b..0000000000
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/menu-reviews.inc
+++ /dev/null
@@ -1,5 +0,0 @@
-<div id="submenu">
-<ul>
-	<li>        <a href="/cgi-bin/koha/reviews/reviewswaiting.pl">Reviews Home</a></li>
-</ul>
-</div>
\ No newline at end of file
diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/menu-serials.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/menu-serials.inc
deleted file mode 100644
index 5c807a61f4..0000000000
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/menu-serials.inc
+++ /dev/null
@@ -1,8 +0,0 @@
-<div id="submenu">
-<ul>
-	<li>        <a href="/cgi-bin/koha/serials/serials-home.pl">Serials Home</a></li>
-	<li>        <a href="/cgi-bin/koha/serials/claims.pl">Claims</a></li>
-	<li>        <a href="/cgi-bin/koha/serials/subscription-add.pl">Add Subscription</a></li>
-	<li>        <a href="/cgi-bin/koha/serials/checkexpiration.pl">Check Expiration</a></li>
-</ul>
-</div>
\ No newline at end of file
diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/menu-virtualshelves.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/menu-virtualshelves.inc
deleted file mode 100644
index 9e65a38c7d..0000000000
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/menu-virtualshelves.inc
+++ /dev/null
@@ -1,5 +0,0 @@
-<div id="submenu">
-<ul>
-	<li>        <a href="/cgi-bin/koha/virtualshelves/shelves.pl">Virtual Shelves</a></li>
-</ul>
-</div>
\ No newline at end of file
diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/menus.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/menus.inc
deleted file mode 100644
index 5fbe43e571..0000000000
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/menus.inc
+++ /dev/null
@@ -1,92 +0,0 @@
-
-<div id="mainmenu">
-
-    <!-- TMPL_IF NAME="CAN_user_circulate" -->
-    <a href="/cgi-bin/koha/circ/circulation.pl">Circulation</a>
-    <ul>
-       <li>
-       <form method="post" action="/cgi-bin/koha/circ/circulation.pl">
-        <label for="navfindborrower">Check out to:</label>
-            <input id="navfindborrower" name="findborrower" type="text" size="10" />
-            <input type="hidden" name="branch" value="<!-- TMPL_VAR name="branch" -->" />
-            <input type="hidden" name="printer" value="<!-- TMPL_VAR name="printer" -->" />
-            <input type="submit" class="submit" value="OK" />
-       </form>
-       </li>
-       <li>
-        <a accesskey="r" href="/cgi-bin/koha/circ/returns.pl">Check in</a>
-       </li>
-        <li><a href="/cgi-bin/koha/circ/branchtransfers.pl">Transfers</a></li>
-     </ul>
-     <!-- /TMPL_IF -->
-    <!-- TMPL_IF NAME="CAN_user_borrowers" -->
-    <a href="/cgi-bin/koha/members/members-home.pl">Patrons</a>
-    <ul>
-        <li><form action="/cgi-bin/koha/members/member.pl" method="post">
-           <label for="navmember">Search:&nbsp;</label>
-           <input id="navmember" type="text" size="10" name="member" />
-           <input type="submit" value="OK" class="submit" />
-            </form>
-        </li>
-    </ul>
-    <!-- /TMPL_IF -->
-                <!-- TMPL_IF NAME="CAN_user_catalogue" -->
-                <a href="/cgi-bin/koha/catalogue/search.pl">Catalogue</a>
-                <ul>
-                    <li>
-                        <form name="searchform" method="get" action="/cgi-bin/koha/catalogue/search.pl" id="searchform">
-                        <input type="hidden" name="idx" value="" />
-                        <label for="navkeyword">
-                            Search:&nbsp;
-                        </label><input type="text" id="navkeyword" name="q" size="10" accesskey="s" />
-                        <input type="submit" value=" OK " class="submit" />
-                        </form>
-                     </li>
-                    <li><a href="/cgi-bin/koha/virtualshelves/shelves.pl">Virtual Shelves</a></li>
-                </ul>
-                <!-- /TMPL_IF -->
-    <!-- TMPL_IF NAME="CAN_user_editcatalogue" -->
-    <a href="/cgi-bin/koha/cataloguing/addbooks.pl">Cataloguing</a>
-    <ul>
-        <li><a href="/cgi-bin/koha/cataloguing/addbiblio.pl">Add MARC</a></li>
-        <li><a href="/cgi-bin/koha/authorities/authorities-home.pl">Authorities</a></li>
-        <li><a href="/cgi-bin/koha/serials/serials-home.pl">Serials</a></li>
-    </ul>
-    <a href="/cgi-bin/koha/acqui/acqui-home.pl">Acquisitions</a>
-    <!-- /TMPL_IF -->
-    <!-- TMPL_IF NAME="CAN_user_reports" -->
-        <a href="/cgi-bin/koha/reports/reports-home.pl">Reports</a></li>
-    <!-- /TMPL_IF -->
-    <!-- TMPL_IF NAME="CAN_user_parameters" -->
-    <a href="/cgi-bin/koha/admin/admin-home.pl">Koha administration</a>
-        <ul>
-            <li><a href="/cgi-bin/koha/admin/systempreferences.pl">System preferences</a></li>
-        </ul>
-    <!-- /TMPL_IF -->
-    <!-- TMPL_IF NAME="CAN_user_tools" -->
-    <a href="/cgi-bin/koha/tools/tools-home.pl">Tools</a>
-    <!-- /TMPL_IF -->
-    <a href="/cgi-bin/koha/about.pl">About Koha</a>
-    <div id="login">
-        <!-- TMPL_IF NAME="loggedinusername" -->
-        <ul>
-        <li>
-            <b> Login information</b>
-        </li>
-        <li>Logged in as: <b> <!-- TMPL_VAR NAME="loggedinusername" --> </b>
-            at <b><!-- TMPL_VAR NAME="LoginBranchcode" --></b></li>
-            <!-- TMPL_IF NAME="AutoLocation" -->
-                <li>autolocate activated</li>
-        <!-- TMPL_ELSE -->
-            <li><a href="/cgi-bin/koha/circ/selectbranchprinter.pl">Change Settings</a></li>
-        <!-- /TMPL_IF -->
-        </ul>
-        <ul>
-            <li><a href="/cgi-bin/koha/mainpage.pl?logout.x=1">Log Out</a></li>
-        </ul>
-        <!-- /TMPL_IF -->
-    </div>
-    <!-- TMPL_IF NAME="IntranetNav" -->
-        <!-- TMPL_VAR NAME="IntranetNav" -->
-    <!-- /TMPL_IF -->
-</div>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/tools-news-toolbar.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/tools-news-toolbar.inc
deleted file mode 100644
index 373a036ee2..0000000000
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/tools-news-toolbar.inc
+++ /dev/null
@@ -1,21 +0,0 @@
-<div id="toolbar">
-	<script type="text/javascript">
-	//<![CDATA[
-
-	// prepare DOM for YUI Toolbar
-
-	 $(document).ready(function() {
-	    yuiToolbar();
-	 });
-
-	// YUI Toolbar Functions
-
-	function yuiToolbar() {
-	    new YAHOO.widget.Button("newentry");
-	}
-
-	//]]>
-	</script>
-	<ul class="toolbar">
-	<li><a id="newentry" href="/cgi-bin/koha/tools/koha-news.pl?op=add_form">New Entry</a></li>
-</ul></div>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/tools-notices-toolbar.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/tools-notices-toolbar.inc
deleted file mode 100644
index 0f140b1903..0000000000
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/tools-notices-toolbar.inc
+++ /dev/null
@@ -1,21 +0,0 @@
-<div id="toolbar">
-	<script type="text/javascript">
-	//<![CDATA[
-
-	// prepare DOM for YUI Toolbar
-
-	 $(document).ready(function() {
-	    yuiToolbar();
-	 });
-
-	// YUI Toolbar Functions
-
-	function yuiToolbar() {
-	    new YAHOO.widget.Button("newnotice");
-	}
-
-	//]]>
-	</script>
-	<ul class="toolbar">
-	<li><a id="newnotice" href="/cgi-bin/koha/tools/letter.pl?op=add_form">New Notice</a></li>
-</ul></div>
\ No newline at end of file
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/koha-news.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/koha-news.tmpl
index 4ffcd241fc..d9f4f23edb 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/koha-news.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/koha-news.tmpl
@@ -15,7 +15,24 @@ Edit News Item<!-- TMPL_ELSE -->Add News Item<!-- /TMPL_IF --><!-- TMPL_ELSE -->
 	<div id="yui-main">
 	<div class="yui-b">
  
-<!-- TMPL_UNLESS NAME="add_form" --><!-- TMPL_INCLUDE NAME="tools-news-toolbar.inc" --><!-- /TMPL_UNLESS -->
+<!-- TMPL_UNLESS NAME="add_form" -->
+<div id="toolbar">
+	<script type="text/javascript">
+	//<![CDATA[
+	// prepare DOM for YUI Toolbar
+	 $(document).ready(function() {
+	    yuiToolbar();
+	 });
+	// YUI Toolbar Functions
+	function yuiToolbar() {
+	    new YAHOO.widget.Button("newentry");
+	}
+	//]]>
+	</script>
+	<ul class="toolbar">
+	<li><a id="newentry" href="/cgi-bin/koha/tools/koha-news.pl?op=add_form">New Entry</a></li>
+</ul></div>
+<!-- /TMPL_UNLESS -->
 
 <!-- TMPL_IF name="add_form" -->
         <form name="add_form" method="post" action="/cgi-bin/koha/tools/koha-news.pl" >
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/letter.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/letter.tmpl
index 6ab82849bc..6dabfd09c4 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/letter.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/letter.tmpl
@@ -107,7 +107,22 @@
 	<div class="yui-b">
 
 	<!-- TMPL_IF NAME="else" -->
-<!-- TMPL_INCLUDE NAME="tools-notices-toolbar.inc" -->
+<div id="toolbar">
+	<script type="text/javascript">
+	//<![CDATA[
+	// prepare DOM for YUI Toolbar
+	 $(document).ready(function() {
+	    yuiToolbar();
+	 });
+	// YUI Toolbar Functions
+	function yuiToolbar() {
+	    new YAHOO.widget.Button("newnotice");
+	}
+	//]]>
+	</script>
+	<ul class="toolbar">
+	<li><a id="newnotice" href="/cgi-bin/koha/tools/letter.pl?op=add_form">New Notice</a></li>
+</ul></div>
 		
 		<!-- TMPL_IF NAME="search" -->
 		<p>You Searched for <b><!-- TMPL_VAR NAME="searchfield" --></b></p>