diff --git a/media-video/qwinff/additional-files/haikuicons.zip b/media-video/qwinff/additional-files/haikuicons.zip
new file mode 100644
index 000000000..c8666bac7
Binary files /dev/null and b/media-video/qwinff/additional-files/haikuicons.zip differ
diff --git a/media-video/qwinff/additional-files/qwinff.rdef.in b/media-video/qwinff/additional-files/qwinff.rdef.in
index 8d709cb9d..87b1f5f01 100644
--- a/media-video/qwinff/additional-files/qwinff.rdef.in
+++ b/media-video/qwinff/additional-files/qwinff.rdef.in
@@ -1,14 +1,68 @@
 
-resource app_flags B_ARGV_ONLY;
+resource app_flags B_MULTIPLE_LAUNCH;
 
 resource app_version {
 	major  = @MAJOR@,
 	middle = @MIDDLE@,
 	minor  = @MINOR@,
+
 	variety = B_APPV_FINAL,
 	internal = 0,
+
 	short_info = "QWinFF",
-	long_info = "A GUI for FFMPEG"
+	long_info = "@LONG_INFO@"
 };
 
-resource app_signature "application/x-vnd.qwinff";
+resource app_signature "@APP_SIGNATURE@";
+
+resource file_types message {
+	"types" = "application/x-asf",
+	"types" = "video",
+	"types" = "audio"
+};
+
+resource vector_icon {
+	$"6E636966080501020106033A7FCB0000000000003A7FCB4A000049400000FFFF"
+	$"FF7EFF0606FFCD0505020106033A7FCB0000000000003A7FCB4B40004A400000"
+	$"FFFFFF7EFF0606FFCD0505020106023CBFE50000000000003C80004780004AC0"
+	$"0081C2C7CCFF8C959D020006023B00000000000000003B00004840004A400000"
+	$"AE803DFF7F4C00020006033A5DC2395A3DB95A3D3A5DC24AA99942F33300C2C7"
+	$"CC7DE9EBECFFC2C7CC020002023AE947B9F66639F6663AE947C86C28C92F0A00"
+	$"00A2FF00FF00A2FFFF02000202BAE94739F666B9F666BAE9474C9B0A4CCBC200"
+	$"00A2FF00FF00A2FFFF120A085E46CB2DBA4E4C2C4C3C4A3C4820602A60460204"
+	$"4234C24D34BEC9343A3C3ABC653ABFE94244BEC944C24D444A3C4ABFE94ABC65"
+	$"0204563ECA453EC6C13E4E464EC0614EC3E5564EC6C14ECA454E5E465EC3E55E"
+	$"C06102044234C24D34BEC9343A3C3ABC653ABFE94244BEC944C24D444A3C4ABF"
+	$"E94ABC650204563ECA453EC6C13E4E464EC0614EC3E5564EC6C14ECA454E5E46"
+	$"5EC3E55EC06102043246BDB046B6A646225222C44722C98F325EB6A65EBDB05E"
+	$"425242C98F42C44702043246BDB046B6A646225222C44722C98F325EB6A65EBD"
+	$"B05E425242C98F42C44706057F002652265226C8AD325AB7875ABCCF5A3E523E"
+	$"C8AD3E52502606057F002652265226C8AD325AB7875ABCCF5A3E523EC8AD3E52"
+	$"50260204323CBDB03CB6A63C224822C04B22C5933254B6A654BDB054424842C5"
+	$"9342C04B0204323CBDB03CB6A63C224822C04B22C5933254B6A654BDB0544248"
+	$"42C59342C04B06069F0E24382438263434302C30343038402C34203428342824"
+	$"2806069F0E5C485C485A4C4C5054504C504840544C604C584C585C580204BC5B"
+	$"C344BCB6C2AABBFFC3DEBD2AC4D8BC5CC493BDF7C51CBF44C43DBEE9C4D7BF9F"
+	$"C3A3BE75C2A9BF42C2EDBDA7C2640204B808C357B86DC3EDB7A3C2BFB5E5C2CE"
+	$"B6AEC282B51CC319B52EC468B4CAC3D1B593C4FFB752C4F1B689C53CB81BC4A6"
+	$"0204BB84C150BAEAC0D5BC1EC1CBBDC5C15EBD20C1D1BE68C0EBBDD7BFADBE71"
+	$"C029BD3EBF33BB96BF9FBC3ABF2CBAF2C0130204B8EAC13EB848C1B3B98DC0C9"
+	$"B8F6BF8EB992C008B85BBF14B6B6BF85B758BF10B614BFF9B6A9C135B60EC0BC"
+	$"B745C1AF020432C4BBBB0CC4BBB94AC4BB2EC5ED2EC5432EC69532C71FB94AC7"
+	$"1FBB0CC71F36C5ED36C69536C543140A000100023ECDC40000000000003EB19F"
+	$"480512428AE20A000101123ECDC40000000000003EB19F480512428AE2011784"
+	$"00040A000102123ECDC40000000000003EB19F480512428AE201178400040A01"
+	$"0103023ECDC40000000000003EB19F480512428AE20A020104023ECDC4000000"
+	$"0000003EB19F480512428AE20A000105123F71C80000000000003F08EC3FFFED"
+	$"46C1AA01178400040A030106023F71C80000000000003F08EC3FFFED46C1AA0A"
+	$"000107123F71C80000000000003F08EC3FFFED46C1AA01178400040A04010802"
+	$"3F71C80000000000003F08EC3FFFED46C1AA0A000109123F71C8000000000000"
+	$"3F08EC3FFFED46C1AA01178400040A05010A023F71C80000000000003F08EC3F"
+	$"FFED46C1AA0A00010D023F71C80000000000003F08EC3FFFED46C1AA0A00010E"
+	$"023F71C80000000000003F08EC3FFFED46C1AA0A00010F023F71C80000000000"
+	$"003F08EC3FFFED46C1AA0A000110023F71C80000000000003F08EC3FFFED46C1"
+	$"AA0A000111023F71C80000000000003F08EC3FFFED46C1AA0A00010C123FC2D9"
+	$"0000000000003F7EA3445C4944457101178400040A07010C023FC2D900000000"
+	$"00003F7EA3445C494445710A00010B123FE16C0000000000003F7EA3BFCC4544"
+	$"457101178400040A06010B023FE16C0000000000003F7EA3BFCC45444571"
+};
diff --git a/media-video/qwinff/qwinff-0.2.1.recipe b/media-video/qwinff/qwinff-0.2.1.recipe
index d13abd999..117f8acaf 100644
--- a/media-video/qwinff/qwinff-0.2.1.recipe
+++ b/media-video/qwinff/qwinff-0.2.1.recipe
@@ -6,14 +6,17 @@ few clicks. Advanced users can also adjust conversion parameters in detail."
 HOMEPAGE="https://qwinff.github.io/"
 COPYRIGHT="2011 Timothy Lin"
 LICENSE="GNU GPL v3"
-REVISION="1"
+REVISION="2"
 SOURCE_URI="https://downloads.sf.net/qwinff/qwinff_$portVersion.tar.gz"
 CHECKSUM_SHA256="b9f230b22e56c5ebd50a2b51dc9369df5006b1e3bf7cfcee819b7745c0d9fc18"
 PATCHES="qwinff-$portVersion.patchset"
-ADDITIONAL_FILES="qwinff.rdef.in"
+ADDITIONAL_FILES="
+	qwinff.rdef.in
+	haikuicons.zip
+	"
 
-ARCHITECTURES="!x86_gcc2 ?x86 ?x86_64"
-SECONDARY_ARCHITECTURES="?x86"
+ARCHITECTURES="!x86_gcc2 ?x86 x86_64"
+SECONDARY_ARCHITECTURES="x86"
 
 PROVIDES="
 	QwinFF$secondaryArchSuffix = $portVersion
@@ -46,6 +49,11 @@ BUILD_PREREQUIRES="
 	cmd:qmake$secondaryArchSuffix >= 5
 	"
 
+PATCH()
+{
+	unzip -o $sourceDir/../../additional-files/haikuicons.zip -d $sourceDir/src/icons
+}
+
 BUILD()
 {
 	make $jobArgs PREFIX=$appsDir/QwinFF
@@ -59,13 +67,17 @@ INSTALL()
 	mv $appsDir/QwinFF/qwinff $appsDir/QwinFF/QwinFF
 	rm -rf $appsDir/QwinFF/bin/
 
+	local APP_SIGNATURE="application/x-vnd.qwinff"
 	local MAJOR="`echo "$portVersion" | cut -d. -f1`"
 	local MIDDLE="`echo "$portVersion" | cut -d. -f2`"
 	local MINOR="`echo "$portVersion" | cut -d. -f3`"
+	local LONG_INFO="$SUMMARY"
 	sed \
+		-e "s|@APP_SIGNATURE@|$APP_SIGNATURE|" \
 		-e "s|@MAJOR@|$MAJOR|" \
 		-e "s|@MIDDLE@|$MIDDLE|" \
 		-e "s|@MINOR@|$MINOR|" \
+		-e "s|@LONG_INFO@|$LONG_INFO|" \
 		$portDir/additional-files/qwinff.rdef.in > qwinff.rdef
 
 	addResourcesToBinaries qwinff.rdef $appsDir/QwinFF/QwinFF