diff --git a/app/src/main/res/drawable-hdpi/ic_volume_off_black_24dp.png b/app/src/main/res/drawable-hdpi/ic_volume_off_black_24dp.png
new file mode 100644
index 000000000..f1326ba7c
Binary files /dev/null and b/app/src/main/res/drawable-hdpi/ic_volume_off_black_24dp.png differ
diff --git a/app/src/main/res/drawable-hdpi/ic_volume_off_white_24dp.png b/app/src/main/res/drawable-hdpi/ic_volume_off_white_24dp.png
new file mode 100644
index 000000000..ce0c21427
Binary files /dev/null and b/app/src/main/res/drawable-hdpi/ic_volume_off_white_24dp.png differ
diff --git a/app/src/main/res/drawable-mdpi/ic_volume_off_black_24dp.png b/app/src/main/res/drawable-mdpi/ic_volume_off_black_24dp.png
new file mode 100644
index 000000000..a629cfff5
Binary files /dev/null and b/app/src/main/res/drawable-mdpi/ic_volume_off_black_24dp.png differ
diff --git a/app/src/main/res/drawable-mdpi/ic_volume_off_white_24dp.png b/app/src/main/res/drawable-mdpi/ic_volume_off_white_24dp.png
new file mode 100644
index 000000000..4681ec141
Binary files /dev/null and b/app/src/main/res/drawable-mdpi/ic_volume_off_white_24dp.png differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_volume_off_black_24dp.png b/app/src/main/res/drawable-xhdpi/ic_volume_off_black_24dp.png
new file mode 100644
index 000000000..52c9cc1de
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/ic_volume_off_black_24dp.png differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_volume_off_white_24dp.png b/app/src/main/res/drawable-xhdpi/ic_volume_off_white_24dp.png
new file mode 100644
index 000000000..732a1c0f4
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/ic_volume_off_white_24dp.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_volume_off_black_24dp.png b/app/src/main/res/drawable-xxhdpi/ic_volume_off_black_24dp.png
new file mode 100644
index 000000000..2d57c8674
Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/ic_volume_off_black_24dp.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_volume_off_white_24dp.png b/app/src/main/res/drawable-xxhdpi/ic_volume_off_white_24dp.png
new file mode 100644
index 000000000..474aae51e
Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/ic_volume_off_white_24dp.png differ
diff --git a/app/src/main/res/drawable-xxxhdpi/ic_volume_off_black_24dp.png b/app/src/main/res/drawable-xxxhdpi/ic_volume_off_black_24dp.png
new file mode 100644
index 000000000..6d9b35584
Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/ic_volume_off_black_24dp.png differ
diff --git a/app/src/main/res/drawable-xxxhdpi/ic_volume_off_white_24dp.png b/app/src/main/res/drawable-xxxhdpi/ic_volume_off_white_24dp.png
new file mode 100644
index 000000000..df06b06b5
Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/ic_volume_off_white_24dp.png differ
diff --git a/app/src/main/res/layout/dialog_url.xml b/app/src/main/res/layout/dialog_url.xml
index bb3fad414..eef44e76b 100644
--- a/app/src/main/res/layout/dialog_url.xml
+++ b/app/src/main/res/layout/dialog_url.xml
@@ -32,12 +32,11 @@
 
     <RadioGroup
         android:id="@+id/video_audio_group"
-        android:layout_width="match_parent"
+        android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_below="@+id/file_name"
-        android:layout_marginBottom="12dp"
         android:layout_marginLeft="20dp"
-        android:layout_marginRight="20dp"
+        android:layout_marginBottom="6dp"
         android:gravity="left"
         android:orientation="horizontal"
         tools:ignore="RtlHardcoded">
@@ -56,11 +55,22 @@
             android:text="@string/audio"/>
     </RadioGroup>
 
+    <Spinner
+        android:id="@+id/quality_spinner"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:minWidth="150dp"
+        android:layout_below="@+id/video_audio_group"
+        android:layout_marginBottom="12dp"
+        android:layout_marginLeft="20dp"
+        android:layout_marginRight="20dp"
+        tools:listitem="@layout/resolutions_spinner_item"/>
+
     <TextView
         android:id="@+id/threads_text_view"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_below="@+id/video_audio_group"
+        android:layout_below="@+id/quality_spinner"
         android:layout_marginBottom="6dp"
         android:layout_marginLeft="24dp"
         android:layout_marginRight="24dp"
diff --git a/app/src/main/res/layout/resolutions_spinner_item.xml b/app/src/main/res/layout/resolutions_spinner_item.xml
new file mode 100644
index 000000000..1fc6c85ab
--- /dev/null
+++ b/app/src/main/res/layout/resolutions_spinner_item.xml
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="48dp">
+
+    <ImageView
+        android:id="@+id/wo_sound_icon"
+        android:layout_width="20dp"
+        android:layout_height="match_parent"
+        android:layout_alignParentLeft="true"
+        android:layout_centerVertical="true"
+        android:layout_marginLeft="4dp"
+        android:scaleType="fitCenter"
+        android:src="?attr/volume_off"
+        tools:ignore="ContentDescription,RtlHardcoded"/>
+
+    <TextView
+        android:id="@android:id/text1"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_centerVertical="true"
+        android:layout_marginLeft="8dp"
+        android:layout_marginRight="8dp"
+        android:layout_toRightOf="@+id/wo_sound_icon"
+        android:ellipsize="end"
+        android:gravity="left"
+        android:maxLines="1"
+        android:textAppearance="@style/TextAppearance.AppCompat.Body1"
+        android:textSize="16sp"
+        tools:ignore="RtlHardcoded"
+        tools:text="MPEG-4 1080p60 very long res"/>
+</RelativeLayout>
\ No newline at end of file
diff --git a/app/src/main/res/values/attrs.xml b/app/src/main/res/values/attrs.xml
index 29396ccfd..b27ef510a 100644
--- a/app/src/main/res/values/attrs.xml
+++ b/app/src/main/res/values/attrs.xml
@@ -13,5 +13,6 @@
     <attr name="popup" format="reference"/>
     <attr name="expand" format="reference"/>
     <attr name="collapse" format="reference"/>
+    <attr name="volume_off" format="reference"/>
     <attr name="separatorColor" format="color"/>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index e518b7811..4afab9443 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -24,6 +24,7 @@
     <string name="screen_rotation">rotation</string>
     <string name="settings_activity_title">Settings</string>
     <string name="use_external_video_player_title">Use external video player</string>
+    <string name="use_external_video_player_summary">Some resolutions will NOT have audio when this option is enabled</string>
     <string name="use_external_audio_player_title">Use external audio player</string>
     <string name="popup_mode_share_menu_title">NewPipe Popup mode</string>
     <string name="rss_button_title" translatable="false">RSS</string>
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 3ef41885f..5800a3ac6 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -26,6 +26,7 @@
         <item name="popup">@drawable/ic_picture_in_picture_black_24dp</item>
         <item name="expand">@drawable/ic_expand_more_black_24dp</item>
         <item name="collapse">@drawable/ic_expand_less_black_24dp</item>
+        <item name="volume_off">@drawable/ic_volume_off_black_24dp</item>
         <item name="separatorColor">@color/light_separator_color</item>
         <item name="colorControlHighlight">@color/light_ripple_color</item>
     </style>
@@ -50,6 +51,7 @@
         <item name="popup">@drawable/ic_picture_in_picture_white_24dp</item>
         <item name="expand">@drawable/ic_expand_more_white_24dp</item>
         <item name="collapse">@drawable/ic_expand_less_white_24dp</item>
+        <item name="volume_off">@drawable/ic_volume_off_white_24dp</item>
         <item name="separatorColor">@color/dark_separator_color</item>
         <item name="colorControlHighlight">@color/dark_ripple_color</item>
     </style>
diff --git a/app/src/main/res/xml/settings.xml b/app/src/main/res/xml/settings.xml
index 9e76ff57a..aa6e2a0db 100644
--- a/app/src/main/res/xml/settings.xml
+++ b/app/src/main/res/xml/settings.xml
@@ -12,6 +12,7 @@
         <CheckBoxPreference
             android:key="@string/use_external_video_player_key"
             android:title="@string/use_external_video_player_title"
+            android:summary="@string/use_external_video_player_summary"
             android:defaultValue="false"/>
 
         <CheckBoxPreference