diff --git a/src/main/java/com/todoroo/astrid/adapter/FilterAdapter.java b/src/main/java/com/todoroo/astrid/adapter/FilterAdapter.java
index 2c9d27125..6bfc3910c 100644
--- a/src/main/java/com/todoroo/astrid/adapter/FilterAdapter.java
+++ b/src/main/java/com/todoroo/astrid/adapter/FilterAdapter.java
@@ -338,7 +338,7 @@ public class FilterAdapter extends ArrayAdapter<FilterListItem> {
             countInt = filterCounter.get(filter);
             viewHolder.size.setText(Integer.toString(countInt));
         }
-        viewHolder.size.setVisibility(countInt > 0 ? View.VISIBLE : View.GONE);
+        viewHolder.size.setVisibility(countInt > 0 ? View.VISIBLE : View.INVISIBLE);
 
         if (selection == viewHolder.item) {
             viewHolder.view.setBackgroundColor(getData(activity, R.attr.drawer_background_selected));
diff --git a/src/main/res/layout/filter_adapter_row.xml b/src/main/res/layout/filter_adapter_row.xml
index 37ed917cb..eae67a064 100644
--- a/src/main/res/layout/filter_adapter_row.xml
+++ b/src/main/res/layout/filter_adapter_row.xml
@@ -1,52 +1,57 @@
 <?xml version="1.0" encoding="utf-8"?>
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="fill_parent"
-    android:layout_height="48dp"
-    android:paddingLeft="@dimen/navigation_drawer_horizontal_margins"
-    android:paddingStart="@dimen/navigation_drawer_horizontal_margins"
-    android:paddingRight="@dimen/navigation_drawer_horizontal_margins"
-    android:paddingEnd="@dimen/navigation_drawer_horizontal_margins"
-    android:orientation="horizontal">
+    android:layout_height="48dp">
 
-    <ImageView
-        android:id="@+id/icon"
-        android:alpha="@dimen/drawer_icon_alpha"
-        android:layout_width="56dp"
-        android:layout_height="wrap_content"
-        android:layout_centerVertical="true"
-        android:scaleType="fitStart"/>
-
-    <!-- filter name -->
-    <TextView
-        android:id="@+id/name"
-        android:textColor="?attr/asTextColor"
-        android:textSize="14sp"
-        android:layout_toRightOf="@id/icon"
-        android:layout_toEndOf="@id/icon"
-        android:fontFamily="@string/font_fontFamily_medium"
-        android:alpha="@dimen/drawer_text_alpha"
-        android:layout_width="fill_parent"
-        android:layout_height="fill_parent"
-        android:checked="false"
-        android:lines="1"
-        android:singleLine="true"
-        android:ellipsize="end"
-        android:gravity="center_vertical" />
-        
     <!-- size -->
-    <TextView android:id="@+id/size"
+    <TextView
+        android:id="@+id/size"
         android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_alignParentRight="true"
+        android:layout_height="fill_parent"
         android:layout_alignParentEnd="true"
-        android:fontFamily="@string/font_fontFamily_medium"
+        android:layout_alignParentRight="true"
         android:alpha="@dimen/drawer_icon_alpha"
-        android:layout_marginRight="5dip"
-        android:layout_marginEnd="5dip"
-        android:layout_centerVertical="true"
-        android:paddingLeft="7dip"
-        android:paddingRight="7dip"
-        android:textColor="?attr/asTextColor"
-        android:gravity="center" />
+        android:fontFamily="@string/font_fontFamily_medium"
+        android:gravity="center_vertical|end"
+        android:minEms="3"
+        android:paddingEnd="@dimen/navigation_drawer_horizontal_margins"
+        android:paddingLeft="@dimen/navigation_drawer_horizontal_margins"
+        android:paddingRight="@dimen/navigation_drawer_horizontal_margins"
+        android:paddingStart="@dimen/navigation_drawer_horizontal_margins"
+        android:textColor="?attr/asTextColor" />
+
+    <LinearLayout
+        android:layout_width="fill_parent"
+        android:layout_height="fill_parent"
+        android:layout_marginLeft="@dimen/navigation_drawer_horizontal_margins"
+        android:layout_marginStart="@dimen/navigation_drawer_horizontal_margins"
+        android:layout_toLeftOf="@id/size"
+        android:layout_toStartOf="@id/size"
+        android:gravity="center_vertical"
+        android:orientation="horizontal">
+
+        <ImageView
+            android:id="@+id/icon"
+            android:layout_width="56dp"
+            android:layout_height="wrap_content"
+            android:alpha="@dimen/drawer_icon_alpha"
+            android:scaleType="fitStart" />
+
+        <!-- filter name -->
+        <TextView
+            android:id="@+id/name"
+            android:layout_width="fill_parent"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center_vertical"
+            android:alpha="@dimen/drawer_text_alpha"
+            android:checked="false"
+            android:ellipsize="end"
+            android:fontFamily="@string/font_fontFamily_medium"
+            android:gravity="center_vertical"
+            android:lines="1"
+            android:singleLine="true"
+            android:textColor="?attr/asTextColor"
+            android:textSize="14sp" />
+    </LinearLayout>
 
 </RelativeLayout>