diff --git a/app/src/main/java/code/name/monkey/retromusic/adapter/base/MediaEntryViewHolder.java b/app/src/main/java/code/name/monkey/retromusic/adapter/base/MediaEntryViewHolder.java
index 69b75dd4f..515a75329 100644
--- a/app/src/main/java/code/name/monkey/retromusic/adapter/base/MediaEntryViewHolder.java
+++ b/app/src/main/java/code/name/monkey/retromusic/adapter/base/MediaEntryViewHolder.java
@@ -21,6 +21,7 @@ import android.widget.ImageView;
 import android.widget.TextView;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
+import androidx.appcompat.widget.AppCompatImageView;
 import androidx.recyclerview.widget.RecyclerView;
 import code.name.monkey.retromusic.R;
 import com.google.android.material.card.MaterialCardView;
@@ -47,7 +48,7 @@ public class MediaEntryViewHolder extends AbstractDraggableSwipeableItemViewHold
 
   @Nullable public View mask;
 
-  @Nullable public View menu;
+  @Nullable public AppCompatImageView menu;
 
   @Nullable public View paletteColorContainer;
 
diff --git a/app/src/main/java/code/name/monkey/retromusic/adapter/song/SongAdapter.kt b/app/src/main/java/code/name/monkey/retromusic/adapter/song/SongAdapter.kt
index 9960c3232..0360e3b57 100644
--- a/app/src/main/java/code/name/monkey/retromusic/adapter/song/SongAdapter.kt
+++ b/app/src/main/java/code/name/monkey/retromusic/adapter/song/SongAdapter.kt
@@ -111,6 +111,7 @@ open class SongAdapter(
             holder.title?.setTextColor(color.primaryTextColor)
             holder.text?.setTextColor(color.secondaryTextColor)
             holder.paletteColorContainer?.setBackgroundColor(color.backgroundColor)
+            holder.menu?.imageTintList= ColorStateList.valueOf(color.primaryTextColor)
         }
         holder.mask?.backgroundTintList = ColorStateList.valueOf(color.primaryTextColor)
     }
diff --git a/app/src/main/res/layout/image.xml b/app/src/main/res/layout/image.xml
index ee8c5fc91..c6af22877 100644
--- a/app/src/main/res/layout/image.xml
+++ b/app/src/main/res/layout/image.xml
@@ -32,6 +32,5 @@
         android:padding="12dp"
         android:textAppearance="@style/TextViewSubtitle1"
         android:textColor="@color/md_white_1000"
-        tools:text="@tools:sample/lorem/random" />
-
+        tools:text="@tools:sample/full_names" />
 </code.name.monkey.retromusic.views.WidthFitSquareLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/item_card.xml b/app/src/main/res/layout/item_card.xml
index 86037eefe..f2974aab0 100644
--- a/app/src/main/res/layout/item_card.xml
+++ b/app/src/main/res/layout/item_card.xml
@@ -36,12 +36,13 @@
                 tools:src="@tools:sample/avatars" />
 
             <LinearLayout
-                android:layout_width="match_parent"
+                android:id="@+id/titleContainer"
+                android:layout_width="0dp"
                 android:layout_height="wrap_content"
                 android:gravity="center_vertical"
                 android:orientation="vertical"
                 android:padding="12dp"
-                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintEnd_toStartOf="@id/menu"
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintTop_toBottomOf="@id/image">
 
@@ -62,6 +63,17 @@
                     android:singleLine="true"
                     tools:text="@tools:sample/full_names" />
             </LinearLayout>
+
+            <androidx.appcompat.widget.AppCompatImageView
+                android:id="@+id/menu"
+                style="@style/OverFlowButton"
+                android:layout_gravity="center_vertical"
+                android:layout_weight="0"
+                app:layout_constraintBottom_toBottomOf="@id/titleContainer"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintStart_toEndOf="@id/titleContainer"
+                app:layout_constraintTop_toTopOf="@id/titleContainer"
+                app:tint="?attr/colorControlNormal" />
         </androidx.constraintlayout.widget.ConstraintLayout>
     </com.google.android.material.card.MaterialCardView>
 </FrameLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/item_card_color.xml b/app/src/main/res/layout/item_card_color.xml
index 438bfde9e..908fe6363 100644
--- a/app/src/main/res/layout/item_card_color.xml
+++ b/app/src/main/res/layout/item_card_color.xml
@@ -34,12 +34,13 @@
                 tools:src="@tools:sample/avatars" />
 
             <LinearLayout
-                android:layout_width="match_parent"
+                android:id="@+id/titleContainer"
+                android:layout_width="0dp"
                 android:layout_height="wrap_content"
                 android:gravity="center_vertical"
                 android:orientation="vertical"
                 android:padding="12dp"
-                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintEnd_toStartOf="@id/menu"
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintTop_toBottomOf="@id/image">
 
@@ -60,6 +61,17 @@
                     android:singleLine="true"
                     tools:text="@tools:sample/full_names" />
             </LinearLayout>
+
+            <androidx.appcompat.widget.AppCompatImageView
+                android:id="@+id/menu"
+                style="@style/OverFlowButton"
+                android:layout_gravity="center_vertical"
+                android:layout_weight="0"
+                app:layout_constraintBottom_toBottomOf="@id/titleContainer"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintStart_toEndOf="@id/titleContainer"
+                app:layout_constraintTop_toTopOf="@id/titleContainer"
+                app:tint="?attr/colorControlNormal" />
         </androidx.constraintlayout.widget.ConstraintLayout>
     </com.google.android.material.card.MaterialCardView>
 </FrameLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/item_grid.xml b/app/src/main/res/layout/item_grid.xml
index 195d9f223..1e67cd8b0 100644
--- a/app/src/main/res/layout/item_grid.xml
+++ b/app/src/main/res/layout/item_grid.xml
@@ -33,12 +33,13 @@
     </com.google.android.material.card.MaterialCardView>
 
     <LinearLayout
-        android:layout_width="match_parent"
+        android:id="@+id/titleContainer"
+        android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:gravity="center_vertical"
         android:orientation="vertical"
         android:padding="12dp"
-        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintEnd_toStartOf="@id/menu"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@id/imageContainer">
 
@@ -60,5 +61,16 @@
             tools:text="@tools:sample/full_names" />
     </LinearLayout>
 
+    <androidx.appcompat.widget.AppCompatImageView
+        android:id="@+id/menu"
+        style="@style/OverFlowButton"
+        android:layout_gravity="center_vertical"
+        android:layout_weight="0"
+        app:layout_constraintBottom_toBottomOf="@id/titleContainer"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toEndOf="@id/titleContainer"
+        app:layout_constraintTop_toTopOf="@id/titleContainer"
+        app:tint="?attr/colorControlNormal" />
+
 
 </androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/layout/item_grid_circle.xml b/app/src/main/res/layout/item_grid_circle.xml
index 5308f9a97..7b8944b81 100644
--- a/app/src/main/res/layout/item_grid_circle.xml
+++ b/app/src/main/res/layout/item_grid_circle.xml
@@ -48,7 +48,6 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:gravity="center"
-            android:paddingTop="4dp"
             android:singleLine="true"
             tools:text="@tools:sample/full_names" />
     </LinearLayout>