diff --git a/res/drawable-hdpi/ic_pageindicator_add.png b/res/drawable-hdpi/ic_pageindicator_add.png
index ab0e5dbd53..971361d56f 100644
Binary files a/res/drawable-hdpi/ic_pageindicator_add.png and b/res/drawable-hdpi/ic_pageindicator_add.png differ
diff --git a/res/drawable-hdpi/ic_pageindicator_current.png b/res/drawable-hdpi/ic_pageindicator_current.png
index 283f44d37f..09405d83a2 100644
Binary files a/res/drawable-hdpi/ic_pageindicator_current.png and b/res/drawable-hdpi/ic_pageindicator_current.png differ
diff --git a/res/drawable-hdpi/ic_pageindicator_current_folder.png b/res/drawable-hdpi/ic_pageindicator_current_folder.png
new file mode 100644
index 0000000000..c3a6f699d2
Binary files /dev/null and b/res/drawable-hdpi/ic_pageindicator_current_folder.png differ
diff --git a/res/drawable-hdpi/ic_pageindicator_default.png b/res/drawable-hdpi/ic_pageindicator_default.png
index 47b9989677..251de44c92 100644
Binary files a/res/drawable-hdpi/ic_pageindicator_default.png and b/res/drawable-hdpi/ic_pageindicator_default.png differ
diff --git a/res/drawable-hdpi/ic_pageindicator_default_folder.png b/res/drawable-hdpi/ic_pageindicator_default_folder.png
new file mode 100644
index 0000000000..48a3218985
Binary files /dev/null and b/res/drawable-hdpi/ic_pageindicator_default_folder.png differ
diff --git a/res/drawable-mdpi/ic_pageindicator_add.png b/res/drawable-mdpi/ic_pageindicator_add.png
index 11659a3b26..50e1ba524f 100644
Binary files a/res/drawable-mdpi/ic_pageindicator_add.png and b/res/drawable-mdpi/ic_pageindicator_add.png differ
diff --git a/res/drawable-mdpi/ic_pageindicator_current.png b/res/drawable-mdpi/ic_pageindicator_current.png
index b41e1bb677..19a89727cf 100644
Binary files a/res/drawable-mdpi/ic_pageindicator_current.png and b/res/drawable-mdpi/ic_pageindicator_current.png differ
diff --git a/res/drawable-mdpi/ic_pageindicator_current_folder.png b/res/drawable-mdpi/ic_pageindicator_current_folder.png
new file mode 100644
index 0000000000..8d6c0b1fff
Binary files /dev/null and b/res/drawable-mdpi/ic_pageindicator_current_folder.png differ
diff --git a/res/drawable-mdpi/ic_pageindicator_default.png b/res/drawable-mdpi/ic_pageindicator_default.png
index e36c25cf1d..6b0a9c9e34 100644
Binary files a/res/drawable-mdpi/ic_pageindicator_default.png and b/res/drawable-mdpi/ic_pageindicator_default.png differ
diff --git a/res/drawable-mdpi/ic_pageindicator_default_folder.png b/res/drawable-mdpi/ic_pageindicator_default_folder.png
new file mode 100644
index 0000000000..c9edf8d887
Binary files /dev/null and b/res/drawable-mdpi/ic_pageindicator_default_folder.png differ
diff --git a/res/drawable-xhdpi/ic_pageindicator_add.png b/res/drawable-xhdpi/ic_pageindicator_add.png
index af1da2d420..9fb5359feb 100644
Binary files a/res/drawable-xhdpi/ic_pageindicator_add.png and b/res/drawable-xhdpi/ic_pageindicator_add.png differ
diff --git a/res/drawable-xhdpi/ic_pageindicator_current.png b/res/drawable-xhdpi/ic_pageindicator_current.png
index 8fa774dee4..c44b88fe98 100644
Binary files a/res/drawable-xhdpi/ic_pageindicator_current.png and b/res/drawable-xhdpi/ic_pageindicator_current.png differ
diff --git a/res/drawable-xhdpi/ic_pageindicator_current_folder.png b/res/drawable-xhdpi/ic_pageindicator_current_folder.png
new file mode 100644
index 0000000000..fa2168f0c7
Binary files /dev/null and b/res/drawable-xhdpi/ic_pageindicator_current_folder.png differ
diff --git a/res/drawable-xhdpi/ic_pageindicator_default.png b/res/drawable-xhdpi/ic_pageindicator_default.png
index 8eb5eb08d4..6d1b5be6bc 100644
Binary files a/res/drawable-xhdpi/ic_pageindicator_default.png and b/res/drawable-xhdpi/ic_pageindicator_default.png differ
diff --git a/res/drawable-xhdpi/ic_pageindicator_default_folder.png b/res/drawable-xhdpi/ic_pageindicator_default_folder.png
new file mode 100644
index 0000000000..ff0ed3991d
Binary files /dev/null and b/res/drawable-xhdpi/ic_pageindicator_default_folder.png differ
diff --git a/res/drawable-xxhdpi/ic_pageindicator_add.png b/res/drawable-xxhdpi/ic_pageindicator_add.png
index c28895229c..f3f6fbede0 100644
Binary files a/res/drawable-xxhdpi/ic_pageindicator_add.png and b/res/drawable-xxhdpi/ic_pageindicator_add.png differ
diff --git a/res/drawable-xxhdpi/ic_pageindicator_current.png b/res/drawable-xxhdpi/ic_pageindicator_current.png
index 22b290e695..3a3a3ae29b 100644
Binary files a/res/drawable-xxhdpi/ic_pageindicator_current.png and b/res/drawable-xxhdpi/ic_pageindicator_current.png differ
diff --git a/res/drawable-xxhdpi/ic_pageindicator_current_dark.png b/res/drawable-xxhdpi/ic_pageindicator_current_dark.png
deleted file mode 100644
index d5c4c8d4eb..0000000000
Binary files a/res/drawable-xxhdpi/ic_pageindicator_current_dark.png and /dev/null differ
diff --git a/res/drawable-xxhdpi/ic_pageindicator_current_folder.png b/res/drawable-xxhdpi/ic_pageindicator_current_folder.png
new file mode 100644
index 0000000000..4ff8ec6bc4
Binary files /dev/null and b/res/drawable-xxhdpi/ic_pageindicator_current_folder.png differ
diff --git a/res/drawable-xxhdpi/ic_pageindicator_default.png b/res/drawable-xxhdpi/ic_pageindicator_default.png
index e608cae30a..b057c6313d 100644
Binary files a/res/drawable-xxhdpi/ic_pageindicator_default.png and b/res/drawable-xxhdpi/ic_pageindicator_default.png differ
diff --git a/res/drawable-xxhdpi/ic_pageindicator_default_dark.png b/res/drawable-xxhdpi/ic_pageindicator_default_dark.png
deleted file mode 100644
index 79d307b075..0000000000
Binary files a/res/drawable-xxhdpi/ic_pageindicator_default_dark.png and /dev/null differ
diff --git a/res/drawable-xxhdpi/ic_pageindicator_default_folder.png b/res/drawable-xxhdpi/ic_pageindicator_default_folder.png
new file mode 100644
index 0000000000..756ad090d5
Binary files /dev/null and b/res/drawable-xxhdpi/ic_pageindicator_default_folder.png differ
diff --git a/src/com/android/launcher3/FolderPagedView.java b/src/com/android/launcher3/FolderPagedView.java
index 216e68dcca..61ad10db4c 100644
--- a/src/com/android/launcher3/FolderPagedView.java
+++ b/src/com/android/launcher3/FolderPagedView.java
@@ -536,7 +536,8 @@ public class FolderPagedView extends PagedView implements Folder.FolderContent {
 
     @Override
     protected PageMarkerResources getPageIndicatorMarker(int pageIndex) {
-        return new PageMarkerResources(R.drawable.ic_pageindicator_current_dark, R.drawable.ic_pageindicator_default_dark);
+        return new PageMarkerResources(R.drawable.ic_pageindicator_current_folder,
+                R.drawable.ic_pageindicator_default_folder);
     }
 
     @Override