diff --git a/app/src/main/java/org/schabi/newpipe/ui/components/menu/icons/BackgroundFromHere.kt b/app/src/main/java/org/schabi/newpipe/ui/components/menu/icons/BackgroundFromHere.kt
index 9c3e2ce91..124103b23 100644
--- a/app/src/main/java/org/schabi/newpipe/ui/components/menu/icons/BackgroundFromHere.kt
+++ b/app/src/main/java/org/schabi/newpipe/ui/components/menu/icons/BackgroundFromHere.kt
@@ -13,24 +13,11 @@ import androidx.compose.ui.graphics.vector.ImageVector
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
 
-/*
-        materialPath {
-            moveTo(12.0f, 4.0f)
-            lineToRelative(-1.41f, 1.41f)
-            lineToRelative(5.59f, 5.59f)
-            horizontalLineToRelative(-12.17f)
-            verticalLineToRelative(2.0f)
-            horizontalLineToRelative(12.17f)
-            lineToRelative(-5.59f, 5.59f)
-            lineToRelative(1.41f, 1.41f)
-            lineToRelative(8.0f, -8.0f)
-            close()
-        }
- */
-
 /**
  * Obtained by combining [androidx.compose.material.icons.filled.Headset]
  * and the tiny arrow in [androidx.compose.material.icons.filled.ContentPasteGo].
+ * Some iterations were made before obtaining this icon, if you want to see them, search through git
+ * history the commit "Remove previous versions of custom PlayShuffled/FromHere icons".
  */
 val Icons.Filled.BackgroundFromHere: ImageVector by lazy {
     materialIcon(name = "Filled.BackgroundFromHere") {
@@ -61,82 +48,6 @@ val Icons.Filled.BackgroundFromHere: ImageVector by lazy {
             lineToRelative(3.99f, -4.0f)
             close()
         }
-        /*materialPath {
-            moveTo(18.6f, 11.00f)
-            lineToRelative(-1.064f, 1.064f)
-            lineToRelative(2.586f, 2.586f)
-            horizontalLineToRelative(-5.622f)
-            verticalLineToRelative(-2.086f)
-            horizontalLineToRelative(-1.5f)
-            verticalLineToRelative(5.672f)
-            horizontalLineToRelative(1.5f)
-            verticalLineToRelative(-2.086f)
-            horizontalLineToRelative(5.622f)
-            lineToRelative(-2.586f, 2.586f)
-            lineToRelative(1.064f, 1.064f)
-            lineToRelative(4.400f, -4.400f)
-            close()
-        }*/
-        /*materialPath {
-            moveTo(18.6f, 11.00f)
-            lineToRelative(-1.064f, 1.064f)
-            lineToRelative(3.336f, 3.336f)
-            lineToRelative(-3.336f, 3.336f)
-            lineToRelative(1.064f, 1.064f)
-            lineToRelative(4.400f, -4.400f)
-            close()
-        }
-        materialPath {
-            moveTo(14f, 11.00f)
-            lineToRelative(-1.064f, 1.064f)
-            lineToRelative(3.336f, 3.336f)
-            lineToRelative(-3.336f, 3.336f)
-            lineToRelative(1.064f, 1.064f)
-            lineToRelative(4.400f, -4.400f)
-            close()
-        }*/
-        /*materialPath {
-            moveTo(18.6f, 11.00f)
-            lineToRelative(-1.064f, 1.064f)
-            lineToRelative(2.586f, 2.586f)
-            horizontalLineToRelative(-7.122f)
-            verticalLineToRelative(1.500f)
-            horizontalLineToRelative(7.122f)
-            lineToRelative(-2.586f, 2.586f)
-            lineToRelative(1.064f, 1.064f)
-            lineToRelative(4.400f, -4.400f)
-            close()
-        }*/
-        /*materialPath {
-            moveTo(17.200f, 11.200f)
-            lineToRelative(-0.775f, 0.775f)
-            lineToRelative(3.075f, 3.075f)
-            horizontalLineToRelative(-6.694f)
-            verticalLineToRelative(1.100f)
-            horizontalLineToRelative(6.694f)
-            lineToRelative(-3.075f, 3.075f)
-            lineToRelative(0.775f, 0.775f)
-            lineToRelative(4.400f, -4.400f)
-            close()
-        }*/
-        /*materialPath {
-            moveTo(12.817f, 12.202f)
-            lineToRelative(-0.916f, 0.916f)
-            lineToRelative(2.977f, 2.983f)
-            lineToRelative(-2.977f, 2.983f)
-            lineToRelative(0.916f, 0.916f)
-            lineToRelative(3.900f, -3.900f)
-            close()
-        }
-        materialPath {
-            moveTo(17.100f, 12.202f)
-            lineToRelative(-0.916f, 0.916f)
-            lineToRelative(2.977f, 2.983f)
-            lineToRelative(-2.977f, 2.983f)
-            lineToRelative(0.916f, 0.916f)
-            lineToRelative(3.900f, -3.900f)
-            close()
-        }*/
     }
 }
 
diff --git a/app/src/main/java/org/schabi/newpipe/ui/components/menu/icons/BackgroundShuffled.kt b/app/src/main/java/org/schabi/newpipe/ui/components/menu/icons/BackgroundShuffled.kt
index a359f326d..ba13c127a 100644
--- a/app/src/main/java/org/schabi/newpipe/ui/components/menu/icons/BackgroundShuffled.kt
+++ b/app/src/main/java/org/schabi/newpipe/ui/components/menu/icons/BackgroundShuffled.kt
@@ -15,7 +15,9 @@ import androidx.compose.ui.unit.dp
 
 /**
  * Obtained by combining [androidx.compose.material.icons.filled.Headset]
- * and the tiny arrow in [androidx.compose.material.icons.filled.ContentPasteGo].
+ * and [androidx.compose.material.icons.filled.Shuffle].
+ * Some iterations were made before obtaining this icon, if you want to see them, search through git
+ * history the commit "Remove previous versions of custom PlayShuffled/FromHere icons".
  */
 val Icons.Filled.BackgroundShuffled: ImageVector by lazy {
     materialIcon(name = "Filled.BackgroundShuffled") {
@@ -58,33 +60,6 @@ val Icons.Filled.BackgroundShuffled: ImageVector by lazy {
             lineToRelative(-1.170f, 1.170f)
             close()
         }
-        /*
-        val thickness = 0.15f
-        materialPath {
-            moveTo(13f, 12f)
-            moveToRelative(3.295f - thickness, 2.585f - 3 * thickness)
-            lineToRelative(-2.590f + 3 * thickness, -2.585f + 3 * thickness)
-            lineToRelative(-0.705f - 2 * thickness, 0.705f + 2 * thickness)
-            lineToRelative(2.585f - 3 * thickness, 2.585f - 3 * thickness)
-            close()
-            moveToRelative(1.955f - 3 * thickness, -2.585f + 3 * thickness)
-            lineToRelative(1.020f + thickness, 1.020f + thickness)
-            lineToRelative(-6.270f + 3 * thickness, 6.265f - 3 * thickness)
-            lineToRelative(0.705f + 2 * thickness, 0.705f + 2 * thickness)
-            lineToRelative(6.275f - 3 * thickness, -6.270f + 3 * thickness)
-            lineToRelative(1.020f + thickness, 1.020f + thickness)
-            lineToRelative(0f, -2.74f - 4 * thickness)
-            close()
-            moveToRelative(0.165f + 7 * thickness, 4.705f + thickness)
-            lineToRelative(-0.705f - 2 * thickness, 0.705f + 2 * thickness)
-            lineToRelative(1.565f - 4 * thickness, 1.565f - 4 * thickness)
-            lineToRelative(-1.025f - thickness, 1.025f + thickness)
-            lineToRelative(2.750f + 4 * thickness, 0f)
-            lineToRelative(0f, -2.750f - 4 * thickness)
-            lineToRelative(-1.020f - thickness, 1.020f + thickness)
-            close()
-        }
-         */
     }
 }
 
diff --git a/app/src/main/java/org/schabi/newpipe/ui/components/menu/icons/PlayFromHere.kt b/app/src/main/java/org/schabi/newpipe/ui/components/menu/icons/PlayFromHere.kt
index f736b40dc..a6166bc81 100644
--- a/app/src/main/java/org/schabi/newpipe/ui/components/menu/icons/PlayFromHere.kt
+++ b/app/src/main/java/org/schabi/newpipe/ui/components/menu/icons/PlayFromHere.kt
@@ -16,6 +16,8 @@ import androidx.compose.ui.unit.dp
 /**
  * Obtained by combining [androidx.compose.material.icons.filled.PlayArrow]
  * and the tiny arrow in [androidx.compose.material.icons.filled.ContentPasteGo].
+ * Some iterations were made before obtaining this icon, if you want to see them, search through git
+ * history the commit "Remove previous versions of custom PlayShuffled/FromHere icons".
  */
 val Icons.Filled.PlayFromHere: ImageVector by lazy {
     materialIcon(name = "Filled.PlayFromHere") {
@@ -37,82 +39,6 @@ val Icons.Filled.PlayFromHere: ImageVector by lazy {
             lineToRelative(3.99f, -4.0f)
             close()
         }
-        /*materialPath {
-            moveTo(18.6f, 11.00f)
-            lineToRelative(-1.064f, 1.064f)
-            lineToRelative(2.586f, 2.586f)
-            horizontalLineToRelative(-5.622f)
-            verticalLineToRelative(-2.086f)
-            horizontalLineToRelative(-1.5f)
-            verticalLineToRelative(5.672f)
-            horizontalLineToRelative(1.5f)
-            verticalLineToRelative(-2.086f)
-            horizontalLineToRelative(5.622f)
-            lineToRelative(-2.586f, 2.586f)
-            lineToRelative(1.064f, 1.064f)
-            lineToRelative(4.400f, -4.400f)
-            close()
-        }*/
-        /*materialPath {
-            moveTo(18.6f, 11.00f)
-            lineToRelative(-1.064f, 1.064f)
-            lineToRelative(3.336f, 3.336f)
-            lineToRelative(-3.336f, 3.336f)
-            lineToRelative(1.064f, 1.064f)
-            lineToRelative(4.400f, -4.400f)
-            close()
-        }
-        materialPath {
-            moveTo(14f, 11.00f)
-            lineToRelative(-1.064f, 1.064f)
-            lineToRelative(3.336f, 3.336f)
-            lineToRelative(-3.336f, 3.336f)
-            lineToRelative(1.064f, 1.064f)
-            lineToRelative(4.400f, -4.400f)
-            close()
-        }*/
-        /*materialPath {
-            moveTo(18.6f, 11.00f)
-            lineToRelative(-1.064f, 1.064f)
-            lineToRelative(2.586f, 2.586f)
-            horizontalLineToRelative(-7.122f)
-            verticalLineToRelative(1.500f)
-            horizontalLineToRelative(7.122f)
-            lineToRelative(-2.586f, 2.586f)
-            lineToRelative(1.064f, 1.064f)
-            lineToRelative(4.400f, -4.400f)
-            close()
-        }*/
-        /*materialPath {
-            moveTo(17.200f, 11.200f)
-            lineToRelative(-0.775f, 0.775f)
-            lineToRelative(3.075f, 3.075f)
-            horizontalLineToRelative(-6.694f)
-            verticalLineToRelative(1.100f)
-            horizontalLineToRelative(6.694f)
-            lineToRelative(-3.075f, 3.075f)
-            lineToRelative(0.775f, 0.775f)
-            lineToRelative(4.400f, -4.400f)
-            close()
-        }*/
-        /*materialPath {
-            moveTo(15.817f, 16.202f)
-            lineToRelative(-0.916f, 0.916f)
-            lineToRelative(2.977f, 2.983f)
-            lineToRelative(-2.977f, 2.983f)
-            lineToRelative(0.916f, 0.916f)
-            lineToRelative(3.900f, -3.900f)
-            close()
-        }
-        materialPath {
-            moveTo(20.100f, 16.202f)
-            lineToRelative(-0.916f, 0.916f)
-            lineToRelative(2.977f, 2.983f)
-            lineToRelative(-2.977f, 2.983f)
-            lineToRelative(0.916f, 0.916f)
-            lineToRelative(3.900f, -3.900f)
-            close()
-        }*/
     }
 }
 
diff --git a/app/src/main/java/org/schabi/newpipe/ui/components/menu/icons/PlayShuffled.kt b/app/src/main/java/org/schabi/newpipe/ui/components/menu/icons/PlayShuffled.kt
index 584c0be08..879c65330 100644
--- a/app/src/main/java/org/schabi/newpipe/ui/components/menu/icons/PlayShuffled.kt
+++ b/app/src/main/java/org/schabi/newpipe/ui/components/menu/icons/PlayShuffled.kt
@@ -15,7 +15,9 @@ import androidx.compose.ui.unit.dp
 
 /**
  * Obtained by combining [androidx.compose.material.icons.filled.PlayArrow]
- * and the tiny arrow in [androidx.compose.material.icons.filled.ContentPasteGo].
+ * and [androidx.compose.material.icons.filled.Shuffle].
+ * Some iterations were made before obtaining this icon, if you want to see them, search through git
+ * history the commit "Remove previous versions of custom PlayShuffled/FromHere icons".
  */
 val Icons.Filled.PlayShuffled: ImageVector by lazy {
     materialIcon(name = "Filled.PlayShuffled") {
diff --git a/app/src/main/java/org/schabi/newpipe/ui/components/menu/icons/PopupFromHere.kt b/app/src/main/java/org/schabi/newpipe/ui/components/menu/icons/PopupFromHere.kt
index f456b48d0..ef550bc40 100644
--- a/app/src/main/java/org/schabi/newpipe/ui/components/menu/icons/PopupFromHere.kt
+++ b/app/src/main/java/org/schabi/newpipe/ui/components/menu/icons/PopupFromHere.kt
@@ -16,6 +16,8 @@ import androidx.compose.ui.unit.dp
 /**
  * Obtained by combining [androidx.compose.material.icons.filled.PictureInPicture]
  * and the tiny arrow in [androidx.compose.material.icons.filled.ContentPasteGo].
+ * Some iterations were made before obtaining this icon, if you want to see them, search through git
+ * history the commit "Remove previous versions of custom PlayShuffled/FromHere icons".
  */
 val Icons.Filled.PopupFromHere: ImageVector by lazy {
     materialIcon(name = "Filled.PopupFromHere") {
@@ -41,12 +43,6 @@ val Icons.Filled.PopupFromHere: ImageVector by lazy {
             verticalLineToRelative(-7.0f)
             curveToRelative(0.0f, -1.1f, -0.9f, -2.0f, -2.0f, -2.0f)
             close()
-            /*moveTo(21.0f, 17.01f)
-            horizontalLineToRelative(-18.0f)
-            verticalLineToRelative(-14.03f)
-            horizontalLineToRelative(18.0f)
-            verticalLineToRelative(14.03f)
-            close()*/
         }
         materialPath {
             moveTo(19f, 11.5f)
@@ -60,95 +56,6 @@ val Icons.Filled.PopupFromHere: ImageVector by lazy {
             lineToRelative(3.99f, -4.0f)
             close()
         }
-        /*materialPath {
-            moveTo(18.6f, 11.00f)
-            lineToRelative(-1.064f, 1.064f)
-            lineToRelative(2.586f, 2.586f)
-            horizontalLineToRelative(-5.622f)
-            verticalLineToRelative(-2.086f)
-            horizontalLineToRelative(-1.5f)
-            verticalLineToRelative(5.672f)
-            horizontalLineToRelative(1.5f)
-            verticalLineToRelative(-2.086f)
-            horizontalLineToRelative(5.622f)
-            lineToRelative(-2.586f, 2.586f)
-            lineToRelative(1.064f, 1.064f)
-            lineToRelative(4.400f, -4.400f)
-            close()
-        }*/
-        /*materialPath {
-            moveTo(18.6f, 11.00f)
-            lineToRelative(-1.064f, 1.064f)
-            lineToRelative(3.336f, 3.336f)
-            lineToRelative(-3.336f, 3.336f)
-            lineToRelative(1.064f, 1.064f)
-            lineToRelative(4.400f, -4.400f)
-            close()
-        }
-        materialPath {
-            moveTo(14f, 11.00f)
-            lineToRelative(-1.064f, 1.064f)
-            lineToRelative(3.336f, 3.336f)
-            lineToRelative(-3.336f, 3.336f)
-            lineToRelative(1.064f, 1.064f)
-            lineToRelative(4.400f, -4.400f)
-            close()
-        }*/
-        /*materialPath { QUESTO È PERFETTO
-            moveTo(18.6f, 11.00f)
-            lineToRelative(-1.064f, 1.064f)
-            lineToRelative(2.586f, 2.586f)
-            horizontalLineToRelative(-7.122f)
-            verticalLineToRelative(1.500f)
-            horizontalLineToRelative(7.122f)
-            lineToRelative(-2.586f, 2.586f)
-            lineToRelative(1.064f, 1.064f)
-            lineToRelative(4.400f, -4.400f)
-            close()
-        }*/
-        /*materialPath {
-            moveTo(18.600f, 11.200f)
-            lineToRelative(-0.775f, 0.775f)
-            lineToRelative(3.075f, 3.075f)
-            horizontalLineToRelative(-6.694f)
-            verticalLineToRelative(1.100f)
-            horizontalLineToRelative(6.694f)
-            lineToRelative(-3.075f, 3.075f)
-            lineToRelative(0.775f, 0.775f)
-            lineToRelative(4.400f, -4.400f)
-            close()
-        }*/
-        /*materialPath {
-            moveTo(18.600f, 11.200f)
-            lineToRelative(-1.41f, 1.41f)
-            lineToRelative(1.99f, 1.99f)
-            horizontalLineToRelative(-6f)
-            verticalLineToRelative(2.00f)
-            horizontalLineToRelative(6f)
-            lineToRelative(-1.99f, 1.99f)
-            lineToRelative(1.41f, 1.41f)
-            lineToRelative(4.400f, -4.400f)
-            close()
-        }*/
-        /*
-        materialPath {
-            moveTo(15.817f, 16.202f)
-            lineToRelative(-0.916f, 0.916f)
-            lineToRelative(2.977f, 2.983f)
-            lineToRelative(-2.977f, 2.983f)
-            lineToRelative(0.916f, 0.916f)
-            lineToRelative(3.900f, -3.900f)
-            close()
-        }
-        materialPath {
-            moveTo(20.100f, 16.202f)
-            lineToRelative(-0.916f, 0.916f)
-            lineToRelative(2.977f, 2.983f)
-            lineToRelative(-2.977f, 2.983f)
-            lineToRelative(0.916f, 0.916f)
-            lineToRelative(3.900f, -3.900f)
-            close()
-        }*/
     }
 }
 
diff --git a/app/src/main/java/org/schabi/newpipe/ui/components/menu/icons/PopupShuffled.kt b/app/src/main/java/org/schabi/newpipe/ui/components/menu/icons/PopupShuffled.kt
index 456d8ffd5..e896bb00e 100644
--- a/app/src/main/java/org/schabi/newpipe/ui/components/menu/icons/PopupShuffled.kt
+++ b/app/src/main/java/org/schabi/newpipe/ui/components/menu/icons/PopupShuffled.kt
@@ -15,7 +15,9 @@ import androidx.compose.ui.unit.dp
 
 /**
  * Obtained by combining [androidx.compose.material.icons.filled.PictureInPicture]
- * and the tiny arrow in [androidx.compose.material.icons.filled.ContentPasteGo].
+ * and [androidx.compose.material.icons.filled.Shuffle].
+ * Some iterations were made before obtaining this icon, if you want to see them, search through git
+ * history the commit "Remove previous versions of custom PlayShuffled/FromHere icons".
  */
 val Icons.Filled.PopupShuffled: ImageVector by lazy {
     materialIcon(name = "Filled.PopupShuffled") {