diff --git a/res/layout/mainlist.xml b/res/layout/mainlist.xml
index 148c3b145..c7cc0dc69 100644
--- a/res/layout/mainlist.xml
+++ b/res/layout/mainlist.xml
@@ -9,7 +9,7 @@
     android:paddingTop="@dimen/activity_vertical_margin"
     tools:context=".ActivityMain" >
 
-    <!-- Filters -->
+    <!-- Frame -->
 
     <LinearLayout
         android:layout_width="match_parent"
@@ -21,6 +21,37 @@
 
         <!-- Restriction category -->
 
+        <LinearLayout
+            android:id="@+id/llCategory"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="horizontal" >
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center_vertical"
+                android:text="@string/title_category"
+                android:textAppearance="?android:attr/textAppearanceSmall"
+                android:textIsSelectable="false" />
+
+            <Spinner
+                android:id="@+id/spRestriction"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_weight="1" />
+
+            <ImageView
+                android:id="@+id/imgInfo"
+                android:layout_width="32dip"
+                android:layout_height="32dip"
+                android:layout_gravity="center_vertical"
+                android:contentDescription="@string/help_application"
+                android:src="?attr/icon_info" />
+        </LinearLayout>
+
+        <!-- Filters -->
+
         <RelativeLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content" >
@@ -33,36 +64,25 @@
                 android:contentDescription="@string/title_category"
                 android:src="?attr/icon_expander_maximized" />
 
-            <LinearLayout
-                android:id="@+id/llCategory"
-                android:layout_width="match_parent"
+            <EditText
+                android:id="@+id/etFilter"
+                android:layout_width="fill_parent"
                 android:layout_height="wrap_content"
+                android:layout_marginLeft="3dp"
                 android:layout_toRightOf="@id/imgToggleFilters"
-                android:orientation="horizontal" >
-
-                <TextView
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_gravity="center_vertical"
-                    android:text="@string/title_category"
-                    android:textAppearance="?android:attr/textAppearanceSmall"
-                    android:textIsSelectable="false" />
-
-                <Spinner
-                    android:id="@+id/spRestriction"
-                    android:layout_width="0dp"
-                    android:layout_height="wrap_content"
-                    android:layout_gravity="center_vertical"
-                    android:layout_weight="1" />
-
-                <ImageView
-                    android:id="@+id/imgInfo"
-                    android:layout_width="32dip"
-                    android:layout_height="32dip"
-                    android:layout_gravity="center_vertical"
-                    android:contentDescription="@string/help_application"
-                    android:src="?attr/icon_info" />
-            </LinearLayout>
+                android:ems="10"
+                android:hint="@string/help_application"
+                android:inputType="textNoSuggestions"
+                android:textAppearance="?android:attr/textAppearanceSmall" />
+
+            <ImageView
+                android:id="@+id/imgClear"
+                android:layout_width="24dip"
+                android:layout_height="24dip"
+                android:layout_alignParentRight="true"
+                android:layout_centerVertical="true"
+                android:contentDescription="@string/help_application"
+                android:src="?attr/icon_clear_grayed" />
 
             <TextView
                 android:id="@+id/tvFilterDetail"
@@ -99,32 +119,6 @@
                 android:contentDescription="@string/help_internet"
                 android:src="?attr/icon_internet_grayed" />
 
-            <RelativeLayout
-                android:layout_width="0dip"
-                android:layout_height="wrap_content"
-                android:layout_weight="1" >
-
-                <EditText
-                    android:id="@+id/etFilter"
-                    android:layout_width="fill_parent"
-                    android:layout_height="wrap_content"
-                    android:layout_gravity="center_vertical"
-                    android:layout_marginLeft="6dip"
-                    android:hint="@string/help_application"
-                    android:inputType="textNoSuggestions"
-                    android:textAppearance="?android:attr/textAppearanceSmall" />
-
-                <ImageView
-                    android:id="@+id/imgClear"
-                    android:layout_width="24dip"
-                    android:layout_height="24dip"
-                    android:layout_alignRight="@id/etFilter"
-                    android:layout_centerVertical="true"
-                    android:layout_gravity="center_vertical"
-                    android:contentDescription="@string/help_application"
-                    android:src="?attr/icon_clear_grayed" />
-            </RelativeLayout>
-
             <CheckBox
                 android:id="@+id/cbFilter"
                 android:layout_width="32dp"
diff --git a/src/biz/bokhorst/xprivacy/ActivityMain.java b/src/biz/bokhorst/xprivacy/ActivityMain.java
index 9001051ff..723da5626 100644
--- a/src/biz/bokhorst/xprivacy/ActivityMain.java
+++ b/src/biz/bokhorst/xprivacy/ActivityMain.java
@@ -850,8 +850,9 @@ private void optionHelp() {
 
 	private void toggleFiltersVisibility() {
 		ImageView imgFilterToggle = (ImageView) findViewById(R.id.imgToggleFilters);
+		ImageView imgClear = (ImageView) findViewById(R.id.imgClear);
 		TextView tvFilters = (TextView) findViewById(R.id.tvFilterDetail);
-		LinearLayout llCategory = (LinearLayout) findViewById(R.id.llCategory);
+		EditText etFilter = (EditText) findViewById(R.id.etFilter);
 		LinearLayout llFilters = (LinearLayout) findViewById(R.id.llFilters);
 		CheckBox cbFPermission = (CheckBox) findViewById(R.id.cbFPermission);
 		CheckBox cbFSystem = (CheckBox) findViewById(R.id.cbFSystem);
@@ -859,7 +860,8 @@ private void toggleFiltersVisibility() {
 		if (mFiltersHidden) {
 			// Change visibility
 			tvFilters.setVisibility(TextView.GONE);
-			llCategory.setVisibility(LinearLayout.VISIBLE);
+			etFilter.setVisibility(EditText.VISIBLE);
+			imgClear.setVisibility(ImageView.VISIBLE);
 			llFilters.setVisibility(LinearLayout.VISIBLE);
 			cbFPermission.setVisibility(CheckBox.VISIBLE);
 			cbFSystem.setVisibility(CheckBox.VISIBLE);
@@ -873,7 +875,6 @@ private void toggleFiltersVisibility() {
 				numberOfFilters++;
 			if (mInternet)
 				numberOfFilters++;
-			EditText etFilter = (EditText) findViewById(R.id.etFilter);
 			if (etFilter.getText().length() > 0)
 				numberOfFilters++;
 			CheckBox cbFilter = (CheckBox) findViewById(R.id.cbFilter);
@@ -893,7 +894,8 @@ private void toggleFiltersVisibility() {
 
 			// Change visibility
 			tvFilters.setVisibility(TextView.VISIBLE);
-			llCategory.setVisibility(LinearLayout.GONE);
+			etFilter.setVisibility(EditText.GONE);
+			imgClear.setVisibility(ImageView.GONE);
 			llFilters.setVisibility(LinearLayout.GONE);
 			cbFPermission.setVisibility(CheckBox.GONE);
 			cbFSystem.setVisibility(CheckBox.GONE);