diff --git a/app/src/main/kotlin/com/simplemobiletools/gallery/activities/EditActivity.kt b/app/src/main/kotlin/com/simplemobiletools/gallery/activities/EditActivity.kt
index d8e53214b..ccfb847a4 100644
--- a/app/src/main/kotlin/com/simplemobiletools/gallery/activities/EditActivity.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/gallery/activities/EditActivity.kt
@@ -234,11 +234,11 @@ class EditActivity : SimpleActivity(), CropImageView.OnCropImageCompleteListener
         }
 
         currentPrimaryActionButton?.applyColorFilter(config.primaryColor)
-        if (currPrimaryAction == PRIMARY_ACTION_CROP_ROTATE) {
-            bottom_editor_edit_actions.beVisible()
-        } else {
+        bottom_editor_filter_actions.beVisibleIf(currPrimaryAction == PRIMARY_ACTION_FILTER)
+        bottom_editor_crop_rotate_actions.beVisibleIf(currPrimaryAction == PRIMARY_ACTION_CROP_ROTATE)
+
+        if (currPrimaryAction != PRIMARY_ACTION_CROP_ROTATE) {
             bottom_aspect_ratios.beGone()
-            bottom_editor_edit_actions.beGone()
             currCropRotateAction = CROP_ROTATE_NONE
         }
     }
diff --git a/app/src/main/res/layout/activity_edit.xml b/app/src/main/res/layout/activity_edit.xml
index 50fc8e022..30c0eaa05 100644
--- a/app/src/main/res/layout/activity_edit.xml
+++ b/app/src/main/res/layout/activity_edit.xml
@@ -19,11 +19,19 @@
         layout="@layout/bottom_actions_aspect_ratio"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_above="@+id/bottom_editor_edit_actions"
+        android:layout_above="@+id/bottom_editor_crop_rotate_actions"
         android:visibility="gone"/>
 
     <include
-        android:id="@+id/bottom_editor_edit_actions"
+        android:id="@+id/bottom_editor_filter_actions"
+        layout="@layout/bottom_editor_actions_filter"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_above="@+id/bottom_editor_primary_actions"
+        android:visibility="gone"/>
+
+    <include
+        android:id="@+id/bottom_editor_crop_rotate_actions"
         layout="@layout/bottom_editor_crop_rotate_actions"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
diff --git a/app/src/main/res/layout/bottom_editor_actions_filter.xml b/app/src/main/res/layout/bottom_editor_actions_filter.xml
new file mode 100644
index 000000000..51b5ffa3e
--- /dev/null
+++ b/app/src/main/res/layout/bottom_editor_actions_filter.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/bottom_actions_filter_wrapper"
+    android:layout_width="match_parent"
+    android:layout_height="@dimen/bottom_actions_height"
+    android:paddingTop="@dimen/medium_margin">
+
+    <com.simplemobiletools.commons.views.MyRecyclerView
+        android:id="@+id/bottom_actions_filter_list"
+        android:layout_width="match_parent"
+        android:layout_height="@dimen/bottom_actions_height"
+        android:orientation="horizontal"/>
+
+</RelativeLayout>