diff --git a/invidious/invidious.php b/invidious/invidious.php
index 7153aab9..033ecce5 100644
--- a/invidious/invidious.php
+++ b/invidious/invidious.php
@@ -96,6 +96,8 @@ function invidious_render(array &$b)
 	$b['html'] = preg_replace("~https?://(?:www\.)?youtube\.com/watch\?v=(.*?)~ism", $server . '/watch?v=$1', $b['html']);
 	$b['html'] = preg_replace("~https?://(?:www\.)?youtube\.com/embed/(.*?)~ism", $server . '/embed/$1', $b['html']);
 	$b['html'] = preg_replace("~https?://(?:www\.)?youtube\.com/shorts/(.*?)~ism", $server . '/shorts/$1', $b['html']);
+	$b['html'] = preg_replace ("/https?:\/\/music.youtube.com\/(.*?)/ism", $server . '/watch?v=$1', $b['html']);
+	$b['html'] = preg_replace ("/https?:\/\/m.youtube.com\/(.*?)/ism", $server . '/watch?v=$1', $b['html']);
 	$b['html'] = preg_replace("/https?:\/\/youtu.be\/(.*?)/ism", $server . '/watch?v=$1', $b['html']);
 
 	if ($original != $b['html']) {
diff --git a/smiley_pack/icons/noncommercial/bluesky.png b/smiley_pack/icons/noncommercial/bluesky.png
new file mode 100644
index 00000000..e7c789ab
Binary files /dev/null and b/smiley_pack/icons/noncommercial/bluesky.png differ
diff --git a/smiley_pack/icons/noncommercial/invidious.gif b/smiley_pack/icons/noncommercial/invidious.gif
new file mode 100644
index 00000000..deb471fe
Binary files /dev/null and b/smiley_pack/icons/noncommercial/invidious.gif differ
diff --git a/smiley_pack/icons/noncommercial/threema.png b/smiley_pack/icons/noncommercial/threema.png
new file mode 100644
index 00000000..897230aa
Binary files /dev/null and b/smiley_pack/icons/noncommercial/threema.png differ
diff --git a/smiley_pack/icons/opensource/raspi.png b/smiley_pack/icons/opensource/raspi.png
new file mode 100644
index 00000000..c07eff2e
Binary files /dev/null and b/smiley_pack/icons/opensource/raspi.png differ
diff --git a/smiley_pack/icons/opensource/thunderbird.png b/smiley_pack/icons/opensource/thunderbird.png
new file mode 100644
index 00000000..2d849e5d
Binary files /dev/null and b/smiley_pack/icons/opensource/thunderbird.png differ
diff --git a/smiley_pack/icons/opensource/tutanota.png b/smiley_pack/icons/opensource/tutanota.png
new file mode 100644
index 00000000..9008c684
Binary files /dev/null and b/smiley_pack/icons/opensource/tutanota.png differ
diff --git a/smiley_pack/icons/opensource/ubuntu.png b/smiley_pack/icons/opensource/ubuntu.png
new file mode 100644
index 00000000..1e68494c
Binary files /dev/null and b/smiley_pack/icons/opensource/ubuntu.png differ