diff --git a/src/css/style.less b/src/css/style.less
index a665a1db..e2d846d8 100644
--- a/src/css/style.less
+++ b/src/css/style.less
@@ -811,6 +811,24 @@ input[type='radio'].nice-radio {
     }
 }
 
+/* Inline button in panel headers or in list group items */
+
+.list-group-item > .btn.pull-right {
+    line-height: 1em;
+    margin-top: -2px;
+}
+
+@media screen and (max-width: @screen-xs-min) {
+    .btn.pull-right, .btn-toolbar.pull-right, .btn-toolbar.pull-right > .btn {
+        margin: 0;
+        margin-top: 5px;
+        display: block;
+        float: none !important;
+    }
+}
+
+
+
 /* Just to be able to override list-group-item with alert-success's background and border colors */
 .alert-success-yo {
 	background-color: #dff0d8;
diff --git a/src/views/diagnosis/diagnosis_show.ms b/src/views/diagnosis/diagnosis_show.ms
index cc9663df..07d64cef 100644
--- a/src/views/diagnosis/diagnosis_show.ms
+++ b/src/views/diagnosis/diagnosis_show.ms
@@ -17,7 +17,7 @@
         <a role="button" category="{{ id }}" class="btn btn-sm btn-info pull-right rerun-diagnosis"><span class="fa-fw fa-refresh"></span> {{t 'rerun_diagnosis'}}</a>
     </div>
     <div class="panel-body collapse {{#unless noIssues}}in{{/unless}}" id="category-{{id}}">
-    <ul class="list-group">
+    <ul class="list-group" style="margin-bottom: 0px">
         <p>Last time ran : {{formatRelative time}}</p>
         {{#items}}
         <li class="list-group-item alert alert-{{status}} alert-{{status}}-yo clearfix">
@@ -26,10 +26,10 @@
             {{/if}}
             {{summary}}
             {{#if issue}}
-            <a href="#" role="button" class="btn btn-sm btn-warning pull-right" style="margin: -5px 5px"><span class="fa-fw fa-times"></span> {{t 'ignore'}}</a>
+            <a href="#" role="button" class="btn btn-sm btn-warning pull-right"><span class="fa-fw fa-times"></span> {{t 'ignore'}}</a>
             {{/if}}
             {{#if details}}
-            <a role="button" class="btn btn-sm btn-default pull-right" style="margin: -5px 5px" data-toggle="collapse" href="#details-{{../id}}-{{@index}}" aria-expanded="false" aria-controls="details-{{../id}}-{{@index}}"><span class="fa-fw fa-level-down"></span>{{t 'details'}}</a>
+            <a role="button" class="btn btn-sm btn-default pull-right" data-toggle="collapse" href="#details-{{../id}}-{{@index}}" aria-expanded="false" aria-controls="details-{{../id}}-{{@index}}"><span class="fa-fw fa-level-down"></span>{{t 'details'}}</a>
             <div class="collapse" id="details-{{../id}}-{{@index}}">
                 <ul>
                 {{#details}}<li>{{.}}</li>{{/details}}
diff --git a/src/views/tools/tools_migrations.ms b/src/views/tools/tools_migrations.ms
index 8a2b678e..9f9a5296 100644
--- a/src/views/tools/tools_migrations.ms
+++ b/src/views/tools/tools_migrations.ms
@@ -11,8 +11,8 @@
         <h2 class="panel-title"><span class="fa-fw fa-cogs"></span> {{t 'migrations_pending'}}
         {{#if pending_migrations}}
         <div class="btn-toolbar pull-right">
-            <a href="#/tools/migrations/run" class="btn btn-success" style="margin-top: -3px"><span class="fa-fw fa-play"></span> {{t 'run'}}</a>
-            <a href="#/tools/migrations/skip" class="btn btn-warning" style="margin-top: -3px"><span class="fa-fw fa-close"></span> {{t 'skip'}}</a>
+            <a href="#/tools/migrations/run" class="btn btn-sm btn-success"><span class="fa-fw fa-play"></span> {{t 'run'}}</a>
+            <a href="#/tools/migrations/skip" class="btn btn-sm btn-warning"><span class="fa-fw fa-close"></span> {{t 'skip'}}</a>
         </div>
         {{/if}}
         </h2>
diff --git a/src/views/update/update.ms b/src/views/update/update.ms
index 62a44b50..2c0aada1 100644
--- a/src/views/update/update.ms
+++ b/src/views/update/update.ms
@@ -37,9 +37,9 @@
     <div class="list-group">
         {{#apps}}
         <div class="list-group-item clearfix">
-            <a href="#/upgrade/apps/{{id}}" role="button" class="btn btn-success pull-right">{{t 'system_upgrade_btn'}}</a>
             <h3 class="list-group-item-heading">{{label}} <small>{{id}}</small></h3>
-            <p class="list-group-item-text">{{t 'from_to' current_version new_version}}</p>
+            <span class="list-group-item-text">{{t 'from_to' current_version new_version}}</span>
+            <a href="#/upgrade/apps/{{id}}" role="button" class="btn btn-success pull-right">{{t 'system_upgrade_btn'}}</a>
         </div>
         {{/apps}}
     </div>