diff --git a/app/src/main/res/drawable/rounded_preview_rect.xml b/app/src/main/res/drawable/rounded_preview_rect.xml
new file mode 100644
index 0000000000..8ff3de7822
--- /dev/null
+++ b/app/src/main/res/drawable/rounded_preview_rect.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+    <corners android:radius="4dp" />
+    <solid android:color="?android:attr/colorBackground" />
+</shape>
\ No newline at end of file
diff --git a/app/src/main/res/layout/theme_item.xml b/app/src/main/res/layout/theme_item.xml
index cbc148f475..5539a91c95 100644
--- a/app/src/main/res/layout/theme_item.xml
+++ b/app/src/main/res/layout/theme_item.xml
@@ -61,7 +61,7 @@
                         android:layout_gravity="start|center"
                         android:layout_marginStart="10dp"
                         android:layout_marginEnd="@dimen/theme_app_bar_margin_end"
-                        android:src="@drawable/oval"
+                        android:src="@drawable/rounded_preview_rect"
                         app:tint="?actionBarTintColor"
                         tools:ignore="ContentDescription" />
 
@@ -69,7 +69,7 @@
 
                 <ImageView
                     android:id="@+id/theme_hero_image"
-                    android:src="@drawable/oval"
+                    android:src="@drawable/rounded_preview_rect"
                     android:layout_width="match_parent"
                     android:layout_height="@dimen/theme_hero_preview"
                     app:tint="?android:attr/textColorPrimary"
@@ -89,7 +89,7 @@
                     android:layout_marginStart="@dimen/theme_padding_preview"
                     android:layout_marginEnd="@dimen/theme_primary_margin_end"
                     android:layout_marginTop="@dimen/theme_text_padding_preview"
-                    android:src="@drawable/oval"
+                    android:src="@drawable/rounded_preview_rect"
                     app:layout_constraintStart_toStartOf="parent"
                     app:layout_constraintTop_toBottomOf="@id/theme_hero_image"
                     app:tint="?android:attr/textColorPrimary"
@@ -114,7 +114,7 @@
                     android:layout_marginStart="@dimen/theme_padding_preview"
                     android:layout_marginTop="@dimen/theme_text_padding_preview"
                     android:layout_marginEnd="@dimen/theme_secondary_margin_end"
-                    android:src="@drawable/oval"
+                    android:src="@drawable/rounded_preview_rect"
                     app:layout_constraintEnd_toStartOf="@id/theme_secondary_text_2"
                     app:layout_constraintStart_toStartOf="parent"
                     app:layout_constraintTop_toBottomOf="@id/theme_primary_text"
@@ -125,8 +125,8 @@
                     android:id="@+id/theme_secondary_text_2"
                     android:layout_width="27dp"
                     android:layout_height="@dimen/theme_text_preview"
-                    android:layout_marginStart="6dp"
-                    android:src="@drawable/oval"
+                    android:layout_marginStart="3dp"
+                    android:src="@drawable/rounded_preview_rect"
                     app:layout_constraintBottom_toBottomOf="@id/theme_secondary_text"
                     app:layout_constraintStart_toEndOf="@id/theme_secondary_text"
                     app:layout_constraintTop_toTopOf="@id/theme_secondary_text"
diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml
index 0521e59658..1550fc8fce 100644
--- a/app/src/main/res/values/dimens.xml
+++ b/app/src/main/res/values/dimens.xml
@@ -11,7 +11,7 @@
     <dimen name="bottom_sheet_width">0dp</dimen>
 
     <dimen name="theme_padding_preview">6dp</dimen>
-    <dimen name="theme_text_padding_preview">6dp</dimen>
+    <dimen name="theme_text_padding_preview">5dp</dimen>
     <dimen name="theme_text_preview">10dp</dimen>
     <dimen name="theme_hero_preview">20dp</dimen>
     <dimen name="theme_app_bar_margin_end">30dp</dimen>