diff --git a/res/css/structures/_RoomSubList.scss b/res/css/structures/_RoomSubList.scss
index 31996f23a2..21fb202137 100644
--- a/res/css/structures/_RoomSubList.scss
+++ b/res/css/structures/_RoomSubList.scss
@@ -56,20 +56,14 @@ limitations under the License.
 }
 
 .mx_RoomSubList_badge {
-    display: inline-block;
-    min-width: 15px;
-    height: 15px;
-    position: absolute;
-    right: 8px; /*gutter */
-    top: 7px;
-    border-radius: 8px;
+    height: 18px;
+    border-radius: 9px;
     color: $accent-fg-color;
     font-weight: 600;
-    font-size: 10px;
-    text-align: center;
-    padding-top: 1px;
-    padding-left: 4px;
-    padding-right: 4px;
+    font-size: 12px;
+    vertical-align: middle;
+    line-height: 18px;
+    padding: 0 4px;
     background-color: $accent-color;
 }
 
diff --git a/res/css/views/rooms/_RoomTile.scss b/res/css/views/rooms/_RoomTile.scss
index 4ad057e3d6..93dcd7a303 100644
--- a/res/css/views/rooms/_RoomTile.scss
+++ b/res/css/views/rooms/_RoomTile.scss
@@ -75,6 +75,11 @@ limitations under the License.
     }
 
     .mx_RoomTile_badge {
+        display: block;
+        position: absolute;
+        height: 15px;
+        right: 8px;
+        top: 2px;
         min-width: 12px;
         border-radius: 16px;
         padding: 0px 4px 0px 4px;
@@ -85,14 +90,6 @@ limitations under the License.
     .mx_RoomTile_highlight .mx_RoomTile_badge:after {
         display: none;
     }
-
-    .mx_RoomTile_badge {
-        display: block;
-        position: absolute;
-        height: 15px;
-        right: 5px;
-        top: 2px;
-    }
 }
 
 /* This is the bottom of the speech bubble */
@@ -113,7 +110,7 @@ limitations under the License.
     border-radius: 8px;
     color: $accent-fg-color;
     font-weight: 600;
-    font-size: 10px;
+    font-size: 12px;
     text-align: center;
     padding-top: 1px;
     padding-left: 4px;
diff --git a/src/components/structures/RoomSubList.js b/src/components/structures/RoomSubList.js
index e00f0f2d03..6410e3af31 100644
--- a/src/components/structures/RoomSubList.js
+++ b/src/components/structures/RoomSubList.js
@@ -328,9 +328,9 @@ const RoomSubList = React.createClass({
                 <AccessibleButton onClick={ this.onClick } className="mx_RoomSubList_label" tabIndex={tabindex}>
                     { chevron }
                     { this.props.collapsed ? '' : this.props.label }
-                    { badge }
                     { incomingCall }
                 </AccessibleButton>
+                { badge }
                 { addRoomButton }
             </div>
         );