diff --git a/.github/readme_feature_dark.webp b/.github/readme_feature_dark.webp
index 109bbc76..0969dc78 100644
Binary files a/.github/readme_feature_dark.webp and b/.github/readme_feature_dark.webp differ
diff --git a/.github/readme_feature_light.webp b/.github/readme_feature_light.webp
index 539bee1b..d418a7a5 100644
Binary files a/.github/readme_feature_light.webp and b/.github/readme_feature_light.webp differ
diff --git a/fastlane/metadata/android/en-US/images/phoneScreenshots/01.png b/fastlane/metadata/android/en-US/images/phoneScreenshots/01.png
index 8cd59676..087e8c3d 100644
Binary files a/fastlane/metadata/android/en-US/images/phoneScreenshots/01.png and b/fastlane/metadata/android/en-US/images/phoneScreenshots/01.png differ
diff --git a/fastlane/metadata/android/en-US/images/phoneScreenshots/02.png b/fastlane/metadata/android/en-US/images/phoneScreenshots/02.png
index a3437005..615fb92a 100644
Binary files a/fastlane/metadata/android/en-US/images/phoneScreenshots/02.png and b/fastlane/metadata/android/en-US/images/phoneScreenshots/02.png differ
diff --git a/fastlane/metadata/android/en-US/images/phoneScreenshots/03.png b/fastlane/metadata/android/en-US/images/phoneScreenshots/03.png
index 99cb5fe1..ddf0f8ac 100644
Binary files a/fastlane/metadata/android/en-US/images/phoneScreenshots/03.png and b/fastlane/metadata/android/en-US/images/phoneScreenshots/03.png differ
diff --git a/fastlane/metadata/android/en-US/images/phoneScreenshots/04.png b/fastlane/metadata/android/en-US/images/phoneScreenshots/04.png
index db2e1b50..f0058408 100644
Binary files a/fastlane/metadata/android/en-US/images/phoneScreenshots/04.png and b/fastlane/metadata/android/en-US/images/phoneScreenshots/04.png differ
diff --git a/fastlane/metadata/android/en-US/images/phoneScreenshots/05.png b/fastlane/metadata/android/en-US/images/phoneScreenshots/05.png
index d0fc9201..5231b751 100644
Binary files a/fastlane/metadata/android/en-US/images/phoneScreenshots/05.png and b/fastlane/metadata/android/en-US/images/phoneScreenshots/05.png differ
diff --git a/fastlane/metadata/android/en-US/images/phoneScreenshots/06.png b/fastlane/metadata/android/en-US/images/phoneScreenshots/06.png
index bb17e176..75a56d40 100644
Binary files a/fastlane/metadata/android/en-US/images/phoneScreenshots/06.png and b/fastlane/metadata/android/en-US/images/phoneScreenshots/06.png differ
diff --git a/fastlane/metadata/android/en-US/images/phoneScreenshots/07.png b/fastlane/metadata/android/en-US/images/phoneScreenshots/07.png
index 901acd6f..72c94107 100644
Binary files a/fastlane/metadata/android/en-US/images/phoneScreenshots/07.png and b/fastlane/metadata/android/en-US/images/phoneScreenshots/07.png differ
diff --git a/fastlane/metadata/android/en-US/images/phoneScreenshots/08.png b/fastlane/metadata/android/en-US/images/phoneScreenshots/08.png
index fbd72953..ab78a039 100644
Binary files a/fastlane/metadata/android/en-US/images/phoneScreenshots/08.png and b/fastlane/metadata/android/en-US/images/phoneScreenshots/08.png differ
diff --git a/fastlane/metadata/android/en-US/images/phoneScreenshots/09.png b/fastlane/metadata/android/en-US/images/phoneScreenshots/09.png
index 69ce256e..7bea5dae 100644
Binary files a/fastlane/metadata/android/en-US/images/phoneScreenshots/09.png and b/fastlane/metadata/android/en-US/images/phoneScreenshots/09.png differ
diff --git a/fastlane/metadata/android/en-US/images/phoneScreenshots/10.png b/fastlane/metadata/android/en-US/images/phoneScreenshots/10.png
index 66fe28a3..11fa43bb 100644
Binary files a/fastlane/metadata/android/en-US/images/phoneScreenshots/10.png and b/fastlane/metadata/android/en-US/images/phoneScreenshots/10.png differ
diff --git a/fastlane/metadata/android/en-US/images/phoneScreenshots/11.png b/fastlane/metadata/android/en-US/images/phoneScreenshots/11.png
new file mode 100644
index 00000000..a109c355
Binary files /dev/null and b/fastlane/metadata/android/en-US/images/phoneScreenshots/11.png differ
diff --git a/fastlane/metadata/android/en-US/images/phoneScreenshots/12.png b/fastlane/metadata/android/en-US/images/phoneScreenshots/12.png
new file mode 100644
index 00000000..1cc3bcd3
Binary files /dev/null and b/fastlane/metadata/android/en-US/images/phoneScreenshots/12.png differ
diff --git a/maestro/feature_graphic.yml b/maestro/feature_graphic.yml
index 4a317f8e..541c108a 100644
--- a/maestro/feature_graphic.yml
+++ b/maestro/feature_graphic.yml
@@ -33,6 +33,12 @@ appId: dev.msfjarvis.claw.android
 - takeScreenshot: "SettingsPage"
 - tapOn:
     point: "50%,50%"
+- tapOn: "Tag filtering"
+- tapOn: "ai"
+- tapOn: "c"
+- tapOn: "css"
+- takeScreenshot: "TagFiltering"
+- back
 - back
 - tapOn: "Hottest"
 - tapOn: "Open comments"
diff --git a/scripts/refresh-feature-graphic.sh b/scripts/refresh-feature-graphic.sh
index 31b75fa8..94842dc2 100755
--- a/scripts/refresh-feature-graphic.sh
+++ b/scripts/refresh-feature-graphic.sh
@@ -42,11 +42,10 @@ function run_maestro_flow() {
 }
 
 function generate_grid() {
-  local MONTAGE_INPUT BACKGROUND_COLOR OUTPUT_FILE START_NUMBER DEVICE_DIMENSIONS
+  local MONTAGE_INPUT OUTPUT_FILE START_NUMBER DEVICE_DIMENSIONS
   MONTAGE_INPUT="$(mktemp)"
   OUTPUT_FILE="${1:?}"
-  BACKGROUND_COLOR="${2:?}"
-  START_NUMBER="${3:?}"
+  START_NUMBER="${2:?}"
   # Get device screen dimensions dynamically
   DEVICE_DIMENSIONS="$(adb shell wm size | grep -oE '[0-9]+x[0-9]+')"
   # Run the Maestro flow to generate the screenshots
@@ -58,8 +57,8 @@ function generate_grid() {
     "${SCREENSHOT_DIR}"/CommentsPage.png \
     "${SCREENSHOT_DIR}"/SavedPosts.png \
     "${SCREENSHOT_DIR}"/SearchPage.png \
-    "xc:${BACKGROUND_COLOR}" \
     "${SCREENSHOT_DIR}"/SettingsPage.png \
+    "${SCREENSHOT_DIR}"/TagFiltering.png \
     >> "${MONTAGE_INPUT}"
 
   # Use imagemagick to stitch the screenshots in a grid
@@ -76,7 +75,7 @@ function generate_grid() {
 
   local FASTLANE_SCREENSHOTS="${SCRIPT_DIR}"/../fastlane/metadata/android/en-US/images/phoneScreenshots
   local COUNTER="${START_NUMBER}"
-  for screenshot in HottestPosts CommentsPage SavedPosts SearchPage SettingsPage; do
+  for screenshot in HottestPosts CommentsPage SavedPosts SearchPage SettingsPage TagFiltering; do
     if [[ -f "${SCREENSHOT_DIR}/${screenshot}.png" ]]; then
       cp "${SCREENSHOT_DIR}/${screenshot}.png" "${FASTLANE_SCREENSHOTS}/$(printf '%02d' "${COUNTER}").png"
       ((COUNTER++))
@@ -89,8 +88,8 @@ function generate_grid() {
 
 adb shell "cmd uimode night no"
 
-generate_grid "${SCRIPT_DIR}"/../.github/readme_feature_light white 1
+generate_grid "${SCRIPT_DIR}"/../.github/readme_feature_light 1
 
 adb shell "cmd uimode night yes"
 
-generate_grid "${SCRIPT_DIR}"/../.github/readme_feature_dark black 6
+generate_grid "${SCRIPT_DIR}"/../.github/readme_feature_dark 7