diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/basket/basket.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/basket/basket.tt
index 4b7d58aabe..36edd9fa2e 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/basket/basket.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/basket/basket.tt
@@ -67,7 +67,7 @@
                         </div>
                         <a class="btn btn-default" href="basket.pl" id="print_cart"><i class="fa fa-print"></i> Print</a>
                         <a class="btn btn-default" href="basket.pl" id="empty_cart"><i class="fa fa-trash-can"></i> Empty and close</a>
-                        <a class="btn btn-default close" href="basket.pl"><i class="fa fa-times-circle"></i> Hide window</a>
+                        <a class="btn btn-default close_window" href="basket.pl"><i class="fa fa-times-circle"></i> Hide window</a>
                     </div>
 
 
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/basket/sendbasketform.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/basket/sendbasketform.tt
index 7908430f76..a867f96782 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/basket/sendbasketform.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/basket/sendbasketform.tt
@@ -7,18 +7,27 @@
 [% END %]</title>
 [% INCLUDE 'doc-head-close.inc' %]
 </head>
-<body style="padding: 1em;" id="cart_sendbasketform" class="cart">
+<body id="cart_sendbasketform" class="cart">
 <div class="container">[% IF ( email_add ) %]
 
 	[% IF ( SENT ) %]
-        <h3>Message sent</h3>
-        <p>The cart was sent to: [% email_add | html %]</p>
-		<p><a class="focus close" href="#">Close window</a></p>
+        <div class="dialog message">
+            <h1>Message sent</h1>
+            <p>The cart was sent to: [% email_add | html %]</p>
+        </div>
 	[% END %]
 	[% IF ( error ) %]
-	<p>Problem sending the cart...</p>
+        <div class="dialog alert">Problem sending the cart...</div>
 	[% END %]
-	
+
+    <nav class="navbar navbar-default navbar-fixed-bottom">
+        <div class="container-fluid">
+            <fieldset class="action">
+                <button type="button" class="btn btn-default close_window focus">Close window</button>
+            </fieldset>
+        </div>
+    </nav>
+
 [% ELSE %]
 
 [% INCLUDE 'blocking_errors.inc' %]
@@ -36,9 +45,17 @@
     </li>
     </ol>
     </fieldset>
-    <fieldset class="action"> <input type="submit" class="btn btn-primary" value="Send" /> <a class="cancel close" href="#">Cancel</a> </fieldset>
     <input type="hidden" name="bib_list" value="[% bib_list | html %]" />
     <input type="hidden" name="csrf_token" value="[% csrf_token | html %]" />
+
+    <nav class="navbar navbar-default navbar-fixed-bottom">
+        <div class="container-fluid">
+            <fieldset class="action">
+                <input type="submit" class="btn btn-primary" value="Send" />
+                <button type="button" class="btn btn-default close_window">Cancel</button>
+            </fieldset>
+        </div>
+    </nav>
 </form>
 
 [% END %]</div>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/sendshelfform.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/sendshelfform.tt
index 92546a120d..cd4462c0eb 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/sendshelfform.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/sendshelfform.tt
@@ -8,19 +8,26 @@
 [% END %]</title>
 [% INCLUDE 'doc-head-close.inc' %]
 </head>
-<body id="lists_sendshelfform" class="lists" style="padding: 1em;">
+<body id="lists_sendshelfform" class="lists">
 [% INCLUDE 'blocking_errors.inc' %]
-<div class="container">[% IF ( email ) %]
+<div class="container-fluid">[% IF ( email ) %]
 
     [% IF ( SENT ) %]
         <h3>Message sent</h3>
         <p>The list was sent to: [% email | html %]</p>
-        <p><a class="close focus" href="#">Close window</a></p>
     [% END %]
     [% IF ( error ) %]
-    <p>Problem sending the list...</p>
+        <p>Problem sending the list...</p>
     [% END %]
-    
+
+    <nav class="navbar navbar-default navbar-fixed-bottom">
+        <div class="container-fluid">
+            <fieldset class="action">
+                <button class="btn btn-default close_window focus">Close window</button>
+            </fieldset>
+        </div>
+    </nav>
+
 [% ELSE %]
 
 <form action="/cgi-bin/koha/virtualshelves/sendshelf.pl" method="post">
@@ -38,7 +45,15 @@
     <li>
         <input type="hidden" name="shelfid" value="[% shelfid | html %]" />
     </li></ol></fieldset>
-       <fieldset class="action"> <input type="submit" class="btn btn-primary" value="Send" /> <a class="cancel close" href="#">Cancel</a> </fieldset>
+
+    <nav class="navbar navbar-default navbar-fixed-bottom">
+        <div class="container-fluid">
+            <fieldset class="action">
+                <input type="submit" class="btn btn-primary" value="Send" />
+                <button class="btn btn-default close_window">Cancel</button>
+            </fieldset>
+        </div>
+    </nav>
 </form>
 
 [% END %]</div>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/shelves.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/shelves.tt
index 397d5f745d..d7288c9376 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/shelves.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/shelves.tt
@@ -945,7 +945,7 @@
         [% IF op == 'view' %]
 
             function sendList(){
-                open(CGIBIN+'virtualshelves/sendshelf.pl?shelfid=[% shelf.shelfnumber | html %]','win_form','scrollbars=no,resizable=no,height=300,width=450,top=50,left=100');
+                openWindow( CGIBIN + 'virtualshelves/sendshelf.pl?shelfid=[% shelf.shelfnumber | html %]' );
              }
 
              $(document).ready(function() {
diff --git a/koha-tmpl/intranet-tmpl/prog/js/basket.js b/koha-tmpl/intranet-tmpl/prog/js/basket.js
index f72d58452b..5a0a21ad84 100644
--- a/koha-tmpl/intranet-tmpl/prog/js/basket.js
+++ b/koha-tmpl/intranet-tmpl/prog/js/basket.js
@@ -367,11 +367,8 @@ function quit() {
 function sendBasket() {
     var valCookie = readCookie(nameCookie);
     var strCookie = nameParam + "=" + valCookie;
-
     var loc = CGIBIN + "basket/sendbasket.pl?" + strCookie;
-
-    var optWin="scrollbars=no,resizable=no,height=400,width=650,top=50,left=100";
-    open(loc,"win_form",optWin);
+    openWindow( loc, "win_form" );
 }
 
 function downloadBasket() {
diff --git a/koha-tmpl/intranet-tmpl/prog/js/staff-global.js b/koha-tmpl/intranet-tmpl/prog/js/staff-global.js
index 3f62a2f6c0..0c274c3a7f 100644
--- a/koha-tmpl/intranet-tmpl/prog/js/staff-global.js
+++ b/koha-tmpl/intranet-tmpl/prog/js/staff-global.js
@@ -59,7 +59,7 @@ $(document).ready(function() {
         $( e.target.hash ).find("input:text:first").focus();
     });
 
-    $(".close").click(function(){ window.close(); });
+    $(".close, .close_window").click(function(){ window.close(); });
 
     $("#checkin_search form").preventDoubleFormSubmit();