diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/basket/downloadcart.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/basket/downloadcart.tmpl
index d05e2a208b..bec6fbeeb6 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/basket/downloadcart.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/basket/downloadcart.tmpl
@@ -1,11 +1,16 @@
-<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Download shelf<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
+<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->
+<title>Koha &rsaquo; Download cart</title>
+<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
 </head>
-<body>
+<body style="padding:1em;">
 <!-- TMPL_IF NAME="format" -->
-    Your Download should automatically start
+    <p>Your download should begin automatically.</p>
 <!-- TMPL_ELSE -->
-<div id="export" class="detailtagcell">    <form method="post" action="/cgi-bin/koha/basket/downloadcart.pl">
-	<label for="format">Download cart:</label>
+<form method="post" action="/cgi-bin/koha/basket/downloadcart.pl">
+<fieldset class="rows">
+	<legend>Download cart</legend>
+	<ol><li>
+	<label for="format">Format:</label>
         <select name="format" id="format">
 	    <option value="">-- Choose Format --</option>
 	    <option value="iso2709">iso2709</option>
@@ -15,14 +20,15 @@
 	    <option value="<!-- TMPL_VAR NAME="export_format_id" -->">CSV - <!-- TMPL_VAR NAME="profile" --></option>
 	    <!-- /TMPL_LOOP -->
 
-	</select>
+	</select></li>
+	</ol>
+	</fieldset>
+	<fieldset class="action">
 	<input type="hidden" name="bib_list" value="<!-- TMPL_VAR NAME="bib_list" -->" />
-	<input type="submit" name="save" value="Go" />
+	<input type="submit" name="save" value="Save" /> <a class="cancel close" href="#">Cancel</a>
+	</fieldset>
     </form>
 
-    <p><a class="button" href="#" onclick="javascript:window.close()">Close this window</a></p>
-    </div>
-
 <!-- /TMPL_IF -->
 </body>
 </html>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/downloadshelf.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/downloadshelf.tmpl
index 52ae03d2bc..5ed72ae2d2 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/downloadshelf.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/downloadshelf.tmpl
@@ -1,14 +1,15 @@
 <!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->
-<title>Download shelf</title>
+<title>Koha &rsaquo; Download shelf</title>
 <!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
 </head>
-<body>
+<body style="padding:1em;">
 <!-- TMPL_IF NAME="format" -->
-    Your Download should automatically start
+    <p>Your download should begin automatically.</p>
 <!-- TMPL_ELSE -->
-<div id="export" class="detailtagcell">    <form method="post" action="/cgi-bin/koha/virtualshelves/downloadshelf.pl">
-	<fieldset class="row">
+<form method="post" action="/cgi-bin/koha/virtualshelves/downloadshelf.pl">
+	<fieldset class="rows">
 	<legend>Download Shelf</legend>
+	<ol><li>
 	<label for="format">Format : </label>
         <select name="format" id="format">
 	    <option value="">-- Choose Format --</option>
@@ -18,16 +19,14 @@
 	    <!-- TMPL_LOOP NAME="csv_profiles" -->
 	    <option value="<!-- TMPL_VAR NAME="export_format_id" -->">CSV - <!-- TMPL_VAR NAME="profile" --></option>
 	    <!-- /TMPL_LOOP -->
-
 	</select>
-	<input type="hidden" name="shelfid" value="<!-- TMPL_VAR NAME="shelfid" -->" />
-	<input type="submit" name="save" value="Go" />
+	</li></ol>
+	</fieldset>
+	<fieldset class="action"><input type="hidden" name="shelfid" value="<!-- TMPL_VAR NAME="shelfid" -->" />
+	<input type="submit" name="save" value="Save" />  <a class="cancel close" href="#">Cancel</a>
 	</fieldset>
     </form>
 
-    <p><a class="button" href="#" onclick="javascript:window.close()">Close this window</a></p>
-    </div>
-
 <!-- /TMPL_IF -->
 </body>
 </html>
diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-downloadcart.tmpl b/koha-tmpl/opac-tmpl/prog/en/modules/opac-downloadcart.tmpl
index 0a01cba853..75adf24042 100644
--- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-downloadcart.tmpl
+++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-downloadcart.tmpl
@@ -1,11 +1,12 @@
-<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Download shelf<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
+<!-- TMPL_INCLUDE NAME="doc-head-open.inc" --><!-- TMPL_IF NAME="LibraryNameTitle" --><!-- TMPL_VAR NAME="LibraryNameTitle" --><!-- TMPL_ELSE -->Koha Online<!-- /TMPL_IF --> Catalog &rsaquo; Download cart<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
 </head>
-<body id="opac-downloadcart">
-<!-- TMPL_IF NAME="format" -->
-    Your Download should automatically start
+<body id="opac-downloadcart" style="padding:1em;">
+<div class="container"><!-- TMPL_IF NAME="format" -->
+    <p>Your download should begin automatically.</p>
 <!-- TMPL_ELSE -->
-<div id="export" class="detailtagcell">    <form method="post" action="/cgi-bin/koha/opac-downloadcart.pl">
-	<label for="format">Download cart:</label>
+<form method="post" action="/cgi-bin/koha/opac-downloadcart.pl">
+	<fieldset class="rows">
+	<ol><li><label for="format">Download cart:</label>
         <select name="format" id="format">
 	    <option value="">-- Choose Format --</option>
 	    <option value="iso2709">iso2709</option>
@@ -15,13 +16,15 @@
 	    <option value="<!-- TMPL_VAR NAME="export_format_id" -->">CSV - <!-- TMPL_VAR NAME="profile" --></option>
 	    <!-- /TMPL_LOOP -->
 
-	</select>
+	</select></li></ol>
+</fieldset>
+<fieldset class="action">
 	<input type="hidden" name="bib_list" value="<!-- TMPL_VAR NAME="bib_list" -->" />
 	<input type="submit" name="save" value="Go" />
+</fieldset>
     </form>
 
-    <p><a class="button" href="#" onclick="javascript:window.close()">Close this window</a></p>
-    </div>
+    <p><a class="button close" href="#">Close this window</a></p>
 
 <!-- /TMPL_IF -->
 </body>