diff --git a/koha-tmpl/opac-tmpl/bootstrap/css/src/opac.scss b/koha-tmpl/opac-tmpl/bootstrap/css/src/opac.scss
index 615c9a05d8..c78024c9f5 100644
--- a/koha-tmpl/opac-tmpl/bootstrap/css/src/opac.scss
+++ b/koha-tmpl/opac-tmpl/bootstrap/css/src/opac.scss
@@ -16,6 +16,8 @@
 
     #sortsubmit {
         display: inline;
+        padding-left: 0;
+        padding-right: 0;
     }
 }
 
@@ -1337,6 +1339,17 @@ nav {
     margin: .3em 0;
 }
 
+.ui-widget-content {
+    a {
+        &:link,
+        &:visited {
+            &.btn {
+                color: #FFF;
+            }
+        }
+    }
+}
+
 #social_networks {
     margin-top: .5em;
 
diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-detail.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-detail.tt
index 2854660887..d566d4c04b 100644
--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-detail.tt
+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-detail.tt
@@ -796,9 +796,9 @@
                                     <span class="email_notifications">
                                         [% IF ( loggedinusername ) %]
                                             [% IF ( subscription.hasalert ) %]
-                                                <span>You have subscribed to email notification on new issues. </span><a style="color:#000;" class="btn" title="Cancel email notification" href="/cgi-bin/koha/opac-alert-subscribe.pl?op=cancel&amp;subscriptionid=[% subscription.subscriptionid | html %]&amp;biblionumber=[% subscription.biblionumber | html %]">Cancel email notification</a>
+                                                <span>You have subscribed to email notification on new issues. </span><a class="btn btn-secondary" title="Cancel email notification" href="/cgi-bin/koha/opac-alert-subscribe.pl?op=cancel&amp;subscriptionid=[% subscription.subscriptionid | html %]&amp;biblionumber=[% subscription.biblionumber | html %]">Cancel email notification</a>
                                             [% ELSE %]
-                                                <a style="color:#000;" class="btn" title="Subscribe to email notification on new issues" href="/cgi-bin/koha/opac-alert-subscribe.pl?subscriptionid=[% subscription.subscriptionid | html %]&amp;biblionumber=[% subscription.biblionumber | html %]">Subscribe to email notification on new issues</a>
+                                                <a class="btn btn-secondary" title="Subscribe to email notification on new issues" href="/cgi-bin/koha/opac-alert-subscribe.pl?subscriptionid=[% subscription.subscriptionid | html %]&amp;biblionumber=[% subscription.biblionumber | html %]">Subscribe to email notification on new issues</a>
                                             [% END %]
                                         [% ELSE %]
                                             <span>You must log in if you want to subscribe to email notification on new issues</span>
diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-results.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-results.tt
index e67f3d815c..7843add315 100644
--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-results.tt
+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-results.tt
@@ -177,7 +177,6 @@
                                         </div>
                                         [% UNLESS tag %]
                                             <div class="sort_by col-sm-auto">
-                                                <div class="text-right">
                                                 <select id="sort_by" class="resort form-control form-control-sm" name="sort_by">
                                                     [% INCLUDE 'resort_form.inc' %]
                                                 </select>
@@ -199,9 +198,9 @@
                                                         [% IF results_per_page == '100' %]<option value="100" selected="selected">100</option>[% ELSE %]<option value="100">100</option>[% END %]
                                                     </select>
                                                 [% END # IF Koha.Preference('OPACnumSearchResultsDropdown') %]
-
-                                                <input type="submit" class="btn btn-sm clearfix" id="sortsubmit" value="Go" />
-                                                </div>
+                                            </div> <!-- /.sort_by -->
+                                            <div id="sortsubmit" class="sort_by col-auto">
+                                                <input type="submit" class="btn btn-primary btn-sm clearfix" value="Go" />
                                             </div> <!-- /.sort_by -->
                                         [% END # /UNLESS tag %]
                                     </div> <!-- / #toolbar -->
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 16e2359156..e28a9a26a4 100644
--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-shelves.tt
+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-shelves.tt
@@ -313,7 +313,7 @@
                                             </optgroup>
                                         </select>
 
-                                        <input type="submit" class="btn btn-sm" id="sort-submit" value="Resort list" />
+                                        <input type="submit" class="btn btn-primary btn-sm" id="sort-submit" value="Resort list" />
                                     </form> <!-- /#sorting-form -->
 
                                 </div> <!-- / #toolbar -->