diff --git a/runbot/static/src/css/runbot.scss b/runbot/static/src/css/runbot.scss
index c6ea7bbb..427a4d93 100644
--- a/runbot/static/src/css/runbot.scss
+++ b/runbot/static/src/css/runbot.scss
@@ -124,14 +124,6 @@ a {
 	border-top: 2px solid #666;
 }
 
-[data-toggle="collapse"] .fa:before {
-	content: "\f139";
-}
-
-[data-toggle="collapse"].collapsed .fa:before {
-	content: "\f13a";
-}
-
 body,
 .table {
 	font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
diff --git a/runbot/templates/bundle.xml b/runbot/templates/bundle.xml
index f403cd74..979f55cd 100644
--- a/runbot/templates/bundle.xml
+++ b/runbot/templates/bundle.xml
@@ -66,12 +66,12 @@
                                                     <small>
                                                         <div class="btn-toolbar mb-1" role="toolbar">
                                                             <div class="btn-group btn-group-ssm" role="group">
-                                                                <a t-att-href="branch.branch_url" class="btn btn-default text-left" title="View Branch on Github"><i class="fa fa-github"/></a>
-                                                                <a groups="runbot.group_runbot_admin" class="btn btn-default fa fa-list text-left" t-attf-href="/web/#id={{branch.id}}&amp;view_type=form&amp;model=runbot.branch" target="new" title="View Branch in Backend"/>
-                                                                <a href="#" t-out="branch.remote_id.short_name" class="btn btn-default disabled text-left"/>
-                                                                <a t-attf-href="/runbot/branch/{{branch.id}}" class="btn btn-default text-left" title="View Branch Details"><span t-att-class="'' if branch.alive else 'line-through'" t-out="branch.name"/> <i t-if="not branch.alive" title="deleted/closed" class="fa fa-ban text-danger"/></a>
+                                                                <a t-att-href="branch.branch_url" class="btn btn-default text-start" title="View Branch on Github"><i class="fa fa-github"/></a>
+                                                                <a groups="runbot.group_runbot_admin" class="btn btn-default fa fa-list text-start" t-attf-href="/web/#id={{branch.id}}&amp;view_type=form&amp;model=runbot.branch" target="new" title="View Branch in Backend"/>
+                                                                <a href="#" t-out="branch.remote_id.short_name" class="btn btn-default disabled text-start"/>
+                                                                <a t-attf-href="/runbot/branch/{{branch.id}}" class="btn btn-default text-start" title="View Branch Details"><span t-att-class="'' if branch.alive else 'line-through'" t-out="branch.name"/> <i t-if="not branch.alive" title="deleted/closed" class="fa fa-ban text-danger"/></a>
                                                                 <t t-if="not any (b.is_pr and b.alive for b in group[1]) and not branch.is_pr">
-                                                                    <a t-attf-href="https://{{group[0].main_remote_id.base_url}}/compare/{{bundle.version_id.name}}...{{branch.remote_id.owner}}:{{branch.name}}?expand=1" class="btn btn-default text-left" title="Create pr"><i class="fa fa-code-fork"/> Create pr</a>
+                                                                    <a t-attf-href="https://{{group[0].main_remote_id.base_url}}/compare/{{bundle.version_id.name}}...{{branch.remote_id.owner}}:{{branch.name}}?expand=1" class="btn btn-default text-start" title="Create pr"><i class="fa fa-code-fork"/> Create pr</a>
                                                                 </t>
                                                             </div>
                                                         </div>
diff --git a/runbot/templates/utils.xml b/runbot/templates/utils.xml
index 00c5d1b1..bb12973d 100644
--- a/runbot/templates/utils.xml
+++ b/runbot/templates/utils.xml
@@ -377,7 +377,7 @@
             <t t-foreach="bundle.branch_ids.sorted(key=lambda b: (not b.alive, b.remote_id.repo_id.sequence, b.remote_id.repo_id.id, b.is_pr, b.id))" t-as="branch">
               <t t-set="link_title" t-value="'View %s %s on Github' % ('PR' if branch.is_pr else 'Branch', branch.name)"/>
               <a t-att-href="branch.branch_url" class="dropdown-item" t-att-title="link_title">
-                <span class="font-italic text-muted" t-out="branch.remote_id.short_name"/> <span t-att-class="'' if branch.alive else 'line-through'" t-out="branch.name"/> <i t-if="not branch.alive" title="deleted/closed" class="fa fa-ban text-danger"/>
+                <span class="fst-italic text-muted" t-out="branch.remote_id.short_name"/> <span t-att-class="'' if branch.alive else 'line-through'" t-out="branch.name"/> <i t-if="not branch.alive" title="deleted/closed" class="fa fa-ban text-danger"/>
               </a>
             </t>
           </div>