diff --git a/src/main/java/com/todoroo/astrid/core/CustomFilterExposer.java b/src/main/java/com/todoroo/astrid/core/CustomFilterExposer.java
index a9894b5c8..507bbaf43 100644
--- a/src/main/java/com/todoroo/astrid/core/CustomFilterExposer.java
+++ b/src/main/java/com/todoroo/astrid/core/CustomFilterExposer.java
@@ -15,6 +15,7 @@ import com.todoroo.astrid.data.StoreObject;
 
 import org.tasks.R;
 import org.tasks.injection.ForApplication;
+import org.tasks.preferences.ResourceResolver;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -32,10 +33,12 @@ public final class CustomFilterExposer {
     static final String TOKEN_FILTER_ID = "id"; //$NON-NLS-1$
 
     private final StoreObjectDao storeObjectDao;
+    private ResourceResolver resourceResolver;
     private final Context context;
 
     @Inject
-    public CustomFilterExposer(@ForApplication Context context, StoreObjectDao storeObjectDao) {
+    public CustomFilterExposer(ResourceResolver resourceResolver, @ForApplication Context context, StoreObjectDao storeObjectDao) {
+        this.resourceResolver = resourceResolver;
         this.context = context;
         this.storeObjectDao = storeObjectDao;
     }
@@ -43,11 +46,13 @@ public final class CustomFilterExposer {
     public List<Filter> getFilters() {
         final List<Filter> list = new ArrayList<>();
 
+        final int filter = resourceResolver.getResource(R.attr.ic_action_filter);
+
         storeObjectDao.getSavedFilters(new Callback<StoreObject>() {
             @Override
             public void apply(StoreObject savedFilter) {
                 Filter f = SavedFilter.load(savedFilter);
-
+                f.icon = filter;
                 Intent deleteIntent = new Intent(context, DeleteFilterActivity.class);
                 deleteIntent.putExtra(TOKEN_FILTER_ID, savedFilter.getId());
                 f.contextMenuLabels = new String[] { context.getString(R.string.BFE_Saved_delete) };
diff --git a/src/main/java/com/todoroo/astrid/gtasks/GtasksFilterExposer.java b/src/main/java/com/todoroo/astrid/gtasks/GtasksFilterExposer.java
index 111dd0f39..c3a8ee354 100644
--- a/src/main/java/com/todoroo/astrid/gtasks/GtasksFilterExposer.java
+++ b/src/main/java/com/todoroo/astrid/gtasks/GtasksFilterExposer.java
@@ -26,6 +26,7 @@ import com.todoroo.astrid.data.Task;
 
 import org.tasks.R;
 import org.tasks.injection.ForApplication;
+import org.tasks.preferences.ResourceResolver;
 
 import java.util.List;
 
@@ -44,12 +45,14 @@ public class GtasksFilterExposer {
 
     private final GtasksListService gtasksListService;
     private final GtasksPreferenceService gtasksPreferenceService;
+    private ResourceResolver resourceResolver;
     private final Context context;
     private final GtasksMetadata gtasksMetadata;
 
     @Inject
-    public GtasksFilterExposer(@ForApplication Context context, GtasksListService gtasksListService,
+    public GtasksFilterExposer(ResourceResolver resourceResolver, @ForApplication Context context, GtasksListService gtasksListService,
                                GtasksPreferenceService gtasksPreferenceService, GtasksMetadata gtasksMetadata) {
+        this.resourceResolver = resourceResolver;
         this.context = context;
         this.gtasksListService = gtasksListService;
         this.gtasksPreferenceService = gtasksPreferenceService;
@@ -62,9 +65,13 @@ public class GtasksFilterExposer {
             return emptyList();
         }
 
+        int cloud = resourceResolver.getResource(R.attr.ic_action_cloud);
+
         List<Filter> listFilters = newArrayList();
         for (GtasksList list : gtasksListService.getLists()) {
-            listFilters.add(filterFromList(gtasksMetadata, context, list));
+            Filter filter = filterFromList(gtasksMetadata, context, list);
+            filter.icon = cloud;
+            listFilters.add(filter);
         }
         return listFilters;
     }
diff --git a/src/main/res/drawable-hdpi/ic_cloud_queue_black_24dp.png b/src/main/res/drawable-hdpi/ic_cloud_queue_black_24dp.png
new file mode 100644
index 000000000..b7ecbeb27
Binary files /dev/null and b/src/main/res/drawable-hdpi/ic_cloud_queue_black_24dp.png differ
diff --git a/src/main/res/drawable-hdpi/ic_cloud_queue_white_24dp.png b/src/main/res/drawable-hdpi/ic_cloud_queue_white_24dp.png
new file mode 100644
index 000000000..aae45eba5
Binary files /dev/null and b/src/main/res/drawable-hdpi/ic_cloud_queue_white_24dp.png differ
diff --git a/src/main/res/drawable-hdpi/ic_filter_list_black_24dp.png b/src/main/res/drawable-hdpi/ic_filter_list_black_24dp.png
new file mode 100644
index 000000000..a966cb9bd
Binary files /dev/null and b/src/main/res/drawable-hdpi/ic_filter_list_black_24dp.png differ
diff --git a/src/main/res/drawable-hdpi/ic_filter_list_white_24dp.png b/src/main/res/drawable-hdpi/ic_filter_list_white_24dp.png
new file mode 100644
index 000000000..7e8a6b536
Binary files /dev/null and b/src/main/res/drawable-hdpi/ic_filter_list_white_24dp.png differ
diff --git a/src/main/res/drawable-xhdpi/ic_cloud_queue_black_24dp.png b/src/main/res/drawable-xhdpi/ic_cloud_queue_black_24dp.png
new file mode 100644
index 000000000..4b88311a1
Binary files /dev/null and b/src/main/res/drawable-xhdpi/ic_cloud_queue_black_24dp.png differ
diff --git a/src/main/res/drawable-xhdpi/ic_cloud_queue_white_24dp.png b/src/main/res/drawable-xhdpi/ic_cloud_queue_white_24dp.png
new file mode 100644
index 000000000..6ef11bb1b
Binary files /dev/null and b/src/main/res/drawable-xhdpi/ic_cloud_queue_white_24dp.png differ
diff --git a/src/main/res/drawable-xhdpi/ic_filter_list_black_24dp.png b/src/main/res/drawable-xhdpi/ic_filter_list_black_24dp.png
new file mode 100644
index 000000000..b64df3612
Binary files /dev/null and b/src/main/res/drawable-xhdpi/ic_filter_list_black_24dp.png differ
diff --git a/src/main/res/drawable-xhdpi/ic_filter_list_white_24dp.png b/src/main/res/drawable-xhdpi/ic_filter_list_white_24dp.png
new file mode 100644
index 000000000..9416c70ec
Binary files /dev/null and b/src/main/res/drawable-xhdpi/ic_filter_list_white_24dp.png differ
diff --git a/src/main/res/drawable-xxhdpi/ic_cloud_queue_black_24dp.png b/src/main/res/drawable-xxhdpi/ic_cloud_queue_black_24dp.png
new file mode 100644
index 000000000..eb6122a48
Binary files /dev/null and b/src/main/res/drawable-xxhdpi/ic_cloud_queue_black_24dp.png differ
diff --git a/src/main/res/drawable-xxhdpi/ic_cloud_queue_white_24dp.png b/src/main/res/drawable-xxhdpi/ic_cloud_queue_white_24dp.png
new file mode 100644
index 000000000..8ba4aecbe
Binary files /dev/null and b/src/main/res/drawable-xxhdpi/ic_cloud_queue_white_24dp.png differ
diff --git a/src/main/res/drawable-xxhdpi/ic_filter_list_black_24dp.png b/src/main/res/drawable-xxhdpi/ic_filter_list_black_24dp.png
new file mode 100644
index 000000000..2314642f9
Binary files /dev/null and b/src/main/res/drawable-xxhdpi/ic_filter_list_black_24dp.png differ
diff --git a/src/main/res/drawable-xxhdpi/ic_filter_list_white_24dp.png b/src/main/res/drawable-xxhdpi/ic_filter_list_white_24dp.png
new file mode 100644
index 000000000..1263ae82e
Binary files /dev/null and b/src/main/res/drawable-xxhdpi/ic_filter_list_white_24dp.png differ
diff --git a/src/main/res/drawable/ic_cloud_queue_black_24dp.png b/src/main/res/drawable/ic_cloud_queue_black_24dp.png
new file mode 100644
index 000000000..ba74612d9
Binary files /dev/null and b/src/main/res/drawable/ic_cloud_queue_black_24dp.png differ
diff --git a/src/main/res/drawable/ic_cloud_queue_white_24dp.png b/src/main/res/drawable/ic_cloud_queue_white_24dp.png
new file mode 100644
index 000000000..94e4392a7
Binary files /dev/null and b/src/main/res/drawable/ic_cloud_queue_white_24dp.png differ
diff --git a/src/main/res/drawable/ic_filter_list_black_24dp.png b/src/main/res/drawable/ic_filter_list_black_24dp.png
new file mode 100644
index 000000000..d86492b42
Binary files /dev/null and b/src/main/res/drawable/ic_filter_list_black_24dp.png differ
diff --git a/src/main/res/drawable/ic_filter_list_white_24dp.png b/src/main/res/drawable/ic_filter_list_white_24dp.png
new file mode 100644
index 000000000..59a2ec755
Binary files /dev/null and b/src/main/res/drawable/ic_filter_list_white_24dp.png differ
diff --git a/src/main/res/values/attrs.xml b/src/main/res/values/attrs.xml
index a8746a8d1..6ee605f80 100644
--- a/src/main/res/values/attrs.xml
+++ b/src/main/res/values/attrs.xml
@@ -55,6 +55,8 @@
     <attr name="importance_background_selected" format="reference" />
     <attr name="fab_icon" format="reference" />
     <attr name="toolbarSeparatorHeight" format="dimension" />
+    <attr name="ic_action_filter" format="reference"/>
+    <attr name="ic_action_cloud" format="reference"/>
 
     <declare-styleable name="DateAndTimePicker">
         <attr name="shortcutLabels" format="reference" />
diff --git a/src/main/res/values/styles.xml b/src/main/res/values/styles.xml
index c1558b35f..e49a73ed1 100644
--- a/src/main/res/values/styles.xml
+++ b/src/main/res/values/styles.xml
@@ -65,6 +65,8 @@
         <item name="ic_action_history">@drawable/ic_history_black_24dp</item>
         <item name="ic_action_uncategorized">@drawable/ic_label_outline_black_24dp</item>
         <item name="ic_action_label">@drawable/ic_label_black_24dp</item>
+        <item name="ic_action_filter">@drawable/ic_filter_list_black_24dp</item>
+        <item name="ic_action_cloud">@drawable/ic_cloud_queue_black_24dp</item>
     </style>
 
     <style name="Tasks.Dark">
@@ -106,6 +108,8 @@
         <item name="ic_action_history">@drawable/ic_history_white_24dp</item>
         <item name="ic_action_uncategorized">@drawable/ic_label_outline_white_24dp</item>
         <item name="ic_action_label">@drawable/ic_label_white_24dp</item>
+        <item name="ic_action_filter">@drawable/ic_filter_list_white_24dp</item>
+        <item name="ic_action_cloud">@drawable/ic_cloud_queue_white_24dp</item>
     </style>
 
     <style name="ActionBar.TitleText" parent="TextAppearance.AppCompat.Widget.ActionBar.Title">