diff --git a/res/drawable-hdpi/rounded_mask.9.png b/res/drawable-hdpi/rounded_mask.9.png
new file mode 100644
index 0000000000000000000000000000000000000000..97617b73db346dfae9628450c658c41d495383ae
Binary files /dev/null and b/res/drawable-hdpi/rounded_mask.9.png differ
diff --git a/res/drawable-xhdpi/rounded_mask.9.png b/res/drawable-xhdpi/rounded_mask.9.png
new file mode 100644
index 0000000000000000000000000000000000000000..053c41a8abf480db696ea56a488c63cc8f183ce9
Binary files /dev/null and b/res/drawable-xhdpi/rounded_mask.9.png differ
diff --git a/res/drawable-xxhdpi/rounded_mask.9.png b/res/drawable-xxhdpi/rounded_mask.9.png
new file mode 100644
index 0000000000000000000000000000000000000000..987a1423590d8b3bf649c12c50cb51e62f4077b9
Binary files /dev/null and b/res/drawable-xxhdpi/rounded_mask.9.png differ
diff --git a/res/values/colors.xml b/res/values/colors.xml
index 2eeb834aa6b8115ef9c23510ca318143e6a591de..96260d544ea4301f64ec3f0e7ab322c6db19e394 100755
--- a/res/values/colors.xml
+++ b/res/values/colors.xml
@@ -15,7 +15,7 @@
 -->
 <resources>
 
-    <color name="default_background">@lineageos.platform:color/color_default_background</color>
+    <color name="default_background">@lineageos.platform:color/color_default_foreground</color>
     <color name="color_default_blue">@lineageos.platform:color/color_default_blue1</color>
     <color name="color_default_primary">@lineageos.platform:color/color_default_primary</color>
 
diff --git a/src/com/android/gallery3d/glrenderer/NinePatchTexture.java b/src/com/android/gallery3d/glrenderer/NinePatchTexture.java
index d0ddc46c36d18d00f4381734b8c12c02d31d269f..44bfcc67d28cb9d69a53a938f2f78fcf5d73dd73 100644
--- a/src/com/android/gallery3d/glrenderer/NinePatchTexture.java
+++ b/src/com/android/gallery3d/glrenderer/NinePatchTexture.java
@@ -190,7 +190,7 @@ class NinePatchInstance {
 
     // We need 22 indices for a normal nine-patch image, plus 2 for each
     // transparent region. Current there are at most 1 transparent region.
-    private static final int INDEX_BUFFER_SIZE = 22 + 2;
+    private static final int INDEX_BUFFER_SIZE = 22 + 10;
 
     private FloatBuffer mXyBuffer;
     private FloatBuffer mUvBuffer;
diff --git a/src/com/android/gallery3d/ui/AbstractSlotRenderer.java b/src/com/android/gallery3d/ui/AbstractSlotRenderer.java
index 48fc3c579c298c9d6e85d67da474fc98a8734e04..3857c169075f8002e7e394acccf789cd5a9c7449 100644
--- a/src/com/android/gallery3d/ui/AbstractSlotRenderer.java
+++ b/src/com/android/gallery3d/ui/AbstractSlotRenderer.java
@@ -36,7 +36,7 @@ public abstract class AbstractSlotRenderer implements SlotView.SlotRenderer {
     private final NinePatchTexture mFrameSelected;
     private final ResourceTexture mDrmIcon;
     private final ResourceTexture mSelectionIcon;
-//    private final NinePatchTexture mRoundedOverlay;
+    private final NinePatchTexture mRoundedOverlay;
     private FadeOutTexture mFramePressedUp;
 
     protected AbstractSlotRenderer(Context context) {
@@ -47,7 +47,7 @@ public abstract class AbstractSlotRenderer implements SlotView.SlotRenderer {
         mFrameSelected = new NinePatchTexture(context, R.drawable.grid_selected);
         mDrmIcon = new ResourceTexture(context, R.drawable.drm_image);
         mSelectionIcon = new ResourceTexture(context, R.drawable.multiselect);
-//        mRoundedOverlay = new NinePatchTexture(context, R.drawable.rounded);
+        mRoundedOverlay = new NinePatchTexture(context, R.drawable.rounded_mask);
     }
 
     protected void drawContent(GLCanvas canvas,
@@ -128,16 +128,16 @@ public abstract class AbstractSlotRenderer implements SlotView.SlotRenderer {
         drawFrame(canvas, mFramePressed.getPaddings(), mFramePressedUp, 0, 0, width, height);
     }
 
-    protected void drawPressedFrame(GLCanvas canvas, int width, int height) {
-        drawFrame(canvas, mFramePressed.getPaddings(), mFramePressed, 0, 0, width, height);
-//        drawFrame(canvas, mFrameSelected.getPaddings(), mFrameSelected, 0, 0, width, height);
+        protected void drawPressedFrame(GLCanvas canvas, int width, int height) {
+//        drawFrame(canvas, mFramePressed.getPaddings(), mFramePressed, 0, 0, width, height);
+        drawFrame(canvas, mFrameSelected.getPaddings(), mFrameSelected, 0, 0, width, height);
     }
 
-//    protected void drawRoundedOverlay(GLCanvas canvas, int width, int height) {
-//        Rect padding = mRoundedOverlay.getPaddings();
-//        mRoundedOverlay.draw(canvas, 0 - padding.left, 0 - padding.top, width + padding.left + padding.right,
-//                height + padding.top + padding.bottom);
-//    }
+    protected void drawRoundedOverlay(GLCanvas canvas, int width, int height) {
+        Rect padding = mRoundedOverlay.getPaddings();
+        mRoundedOverlay.draw(canvas, 0 - padding.left, 0 - padding.top, width + padding.left + padding.right,
+                height + padding.top + padding.bottom);
+    }
 
 
     protected void drawSelectedFrame(GLCanvas canvas, int width, int height) {
diff --git a/src/com/android/gallery3d/ui/TimeLineSlotRenderer.java b/src/com/android/gallery3d/ui/TimeLineSlotRenderer.java
index 81a43002f3ec31dccf1d9dc162e8565aa74d46b4..f3c55f23d1b30b51e4d9730842752f8b86c3fbf5 100644
--- a/src/com/android/gallery3d/ui/TimeLineSlotRenderer.java
+++ b/src/com/android/gallery3d/ui/TimeLineSlotRenderer.java
@@ -191,9 +191,9 @@ public class TimeLineSlotRenderer extends AbstractSlotRenderer {
             }
             drawContent(canvas, content, width, height, entry.rotation);
 
-//            if (entry.mediaType != MediaObject.MEDIA_TYPE_TIMELINE_TITLE) {
-//                drawRoundedOverlay(canvas, width, height);
-//            }
+            if (entry.mediaType != MediaObject.MEDIA_TYPE_TIMELINE_TITLE) {
+                drawRoundedOverlay(canvas, width, height);
+            }
 
             if (entry.mediaType == MediaObject.MEDIA_TYPE_VIDEO) {
                 drawVideoOverlay(canvas, width, height, true, 0);