diff --git a/src/main/res/drawable-v21/filter_row_selector.xml b/src/main/res/drawable-v21/filter_row_selector.xml
deleted file mode 100644
index 261b9e33e..000000000
--- a/src/main/res/drawable-v21/filter_row_selector.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:state_pressed="true" android:drawable="@drawable/ripple"/>
-    <item android:state_pressed="false" android:drawable="@color/drawer_background"/>
-</selector>
\ No newline at end of file
diff --git a/src/main/res/drawable-v21/filter_row_selector_dark.xml b/src/main/res/drawable-v21/filter_row_selector_dark.xml
deleted file mode 100644
index 1c4d914f4..000000000
--- a/src/main/res/drawable-v21/filter_row_selector_dark.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:state_pressed="true" android:drawable="@drawable/ripple_dark"/>
-    <item android:state_pressed="false" android:drawable="@color/drawer_background_dark"/>
-</selector>
\ No newline at end of file
diff --git a/src/main/res/drawable-v21/ripple.xml b/src/main/res/drawable-v21/ripple.xml
deleted file mode 100644
index e20c0dadc..000000000
--- a/src/main/res/drawable-v21/ripple.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<ripple xmlns:android="http://schemas.android.com/apk/res/android"
-    android:color="?android:colorControlHighlight">
-    <item android:id="@android:id/mask" android:drawable="@color/drawer_background_selected"/>
-    <item android:drawable="@color/drawer_background_selected"/>
-</ripple>
\ No newline at end of file
diff --git a/src/main/res/drawable-v21/ripple_dark.xml b/src/main/res/drawable-v21/ripple_dark.xml
deleted file mode 100644
index f841e73b8..000000000
--- a/src/main/res/drawable-v21/ripple_dark.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<ripple xmlns:android="http://schemas.android.com/apk/res/android"
-    android:color="?android:colorControlHighlight">
-    <item android:id="@android:id/mask" android:drawable="@color/drawer_background_selected_dark"/>
-    <item android:drawable="@color/drawer_background_selected_dark"/>
-</ripple>
\ No newline at end of file
diff --git a/src/main/res/layout/fragment_navigation_drawer.xml b/src/main/res/layout/fragment_navigation_drawer.xml
index a34fc7742..a70b24f2b 100644
--- a/src/main/res/layout/fragment_navigation_drawer.xml
+++ b/src/main/res/layout/fragment_navigation_drawer.xml
@@ -10,7 +10,6 @@
         android:layout_height="0dp"
         android:layout_weight="1"
         android:background="?attr/drawer_background"
-        android:listSelector="?attr/asFilterRowSelected"
         android:cacheColorHint="@android:color/transparent"
         android:choiceMode="singleChoice"
         android:divider="@android:color/transparent"
@@ -31,24 +30,20 @@
             android:layout_height="1px"
             android:background="?attr/asSeparatorBackground" />
 
-            <!-- filter name -->
-        <TextView
+        <Button
             android:id="@+id/settings_row"
             android:layout_width="match_parent"
             android:layout_height="45dp"
-            android:clickable="true"
-            android:longClickable="false"
-            android:background="?attr/asFilterRowSelected"
+            android:gravity="start|center_vertical"
+            android:drawableStart="?attr/ic_action_settings"
             android:drawableLeft="?attr/ic_action_settings"
-            android:paddingLeft="10dp"
             android:drawablePadding="10dp"
+            android:paddingLeft="10dp"
+            android:paddingStart="10dp"
             android:textAppearance="@style/TextAppearance.FLA_Filter"
-            android:checked="false"
-            android:lines="1"
-            android:singleLine="true"
-            android:ellipsize="end"
-            android:gravity="center_vertical"
-            android:text="@string/TLA_menu_settings"/>
+            android:layout_gravity="start"
+            android:text="@string/TLA_menu_settings"
+            android:background="?android:attr/selectableItemBackground"/>
 
     </LinearLayout>
 
diff --git a/src/main/res/values/attrs.xml b/src/main/res/values/attrs.xml
index 26fa74ac0..28a14ca6c 100644
--- a/src/main/res/values/attrs.xml
+++ b/src/main/res/values/attrs.xml
@@ -47,7 +47,6 @@
     <attr name="ic_action_calendar_month" format="reference"/>
     <attr name="drawer_text" format="color"/>
     <attr name="importance_background_selected" format="reference"/>
-    <attr name="asFilterRowSelected" format="reference"/>
   <attr name="fab_icon" format="reference"/>
 
   <declare-styleable name="DateAndTimePicker">
diff --git a/src/main/res/values/styles.xml b/src/main/res/values/styles.xml
index 5e2c68c95..b39947cbf 100644
--- a/src/main/res/values/styles.xml
+++ b/src/main/res/values/styles.xml
@@ -40,7 +40,6 @@
         <item name="asDueDateColor">#878787</item>
         <item name="asListDividerColor">#dddddd</item>
         <item name="asEditRowBackground">@drawable/task_edit_background_white</item>
-        <item name="asFilterRowSelected">@drawable/filter_row_selector</item>
         <item name="asTaskRowSelector">@drawable/task_row_bg_white</item>
         <item name="asThemeTextColor">@color/dark_blue_theme_color</item>
         <item name="asAbBackgroundColor">#607d8b</item>
@@ -77,7 +76,6 @@
         <item name="asAbBackgroundColor">@android:color/black</item>
         <item name="drawer_text">@android:color/white</item>
         <item name="ic_action_settings">@drawable/ic_action_gear_white</item>
-        <item name="asFilterRowSelected">@drawable/filter_row_selector_dark</item>
         <item name="task_edit_divider">@color/task_edit_divider_dark</item>
         <item name="ic_action_attachment">@drawable/ic_action_attachment_2</item>
         <item name="ic_action_clock">@drawable/ic_action_clock_white</item>