diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/includes/bodytag.inc b/koha-tmpl/opac-tmpl/bootstrap/en/includes/bodytag.inc
index 487d7e94f4..c2c6005310 100644
--- a/koha-tmpl/opac-tmpl/bootstrap/en/includes/bodytag.inc
+++ b/koha-tmpl/opac-tmpl/bootstrap/en/includes/bodytag.inc
@@ -1,15 +1,15 @@
 [% classprop  = 'class="' %]
 [% IF LoginBranchcode.defined %]
-    [% classprop = classprop _ 'branch-' _ LoginBranchcode %]
+    [% classprop = classprop.raw _ 'branch-' _ LoginBranchcode %]
 [% ELSE %]
-    [% classprop = classprop _ 'branch-default' %]
+    [% classprop = classprop.raw _ 'branch-default' %]
 [% END %]
 [% IF bodyclass.defined %]
-    [% classprop = classprop _ ' ' _ bodyclass %]
+    [% classprop = classprop.raw _ ' ' _ bodyclass %]
 [% END %]
-[% classprop = classprop _ '"' %]
+[% classprop = classprop.raw _ '"' %]
 
 [% IF bodyid.defined %]
     [% idprop = 'ID="' _ bodyid _ '" ' %]
 [% END %]
-<body [%idprop%][% classprop %] >
+<body [%idprop%][% classprop.raw %] >
diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-shelves.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-shelves.tt
index 7caa84c27b..63d848ee3a 100644
--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-shelves.tt
+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-shelves.tt
@@ -157,6 +157,13 @@
                         <h3>
                             [% shelf.shelfname %]
                             <a href="[% OPACBaseURL %]/cgi-bin/koha/opac-shelves.pl?rss=1&amp;op=view&amp;shelfnumber=[% shelf.shelfnumber %]" class="rss-list-link noprint">
+                                <img src="[% interface %]/[% theme %]/images/feed-icon-16x16.png" alt="Subscribe to this list" title="Subscribe to this list" border="0" class="rsssearchicon"/>
+                            </a>
+                        </h3>
+
+                         [% IF ( itemsloop ) %]
+                             <div id="toolbar" class="toolbar clearfix">
+                                 <div class="list-actions">
                                     <a class="newshelf" href="/cgi-bin/koha/opac-shelves.pl?op=add_form">New list</a> <span class="sep">|</span>
                                     <a href="/cgi-bin/koha/opac-downloadshelf.pl?shelfnumber=[% shelf.shelfnumber %]" class="download" data-toggle="modal" data-target="#modalWin">Download list</a>
 
@@ -514,7 +521,7 @@
                                 [% END %]
                             </div>
                         [% END # / IF itemsloop %]
-
+                      [% END %]
                     [% IF itemsloop && can_remove_biblios %]
                         <input type="hidden" name="op" value="remove_biblios" />
                         <input type="hidden" name="shelfnumber" value="[% shelf.shelfnumber %]" />