diff --git a/build/jam/BeOSRules b/build/jam/BeOSRules
index 93c0f7ce63..a7cc7c8ead 100644
--- a/build/jam/BeOSRules
+++ b/build/jam/BeOSRules
@@ -24,7 +24,7 @@ rule AddFileDataAttribute target : attrName : attrType : dataFile
 
 	ATTRIBUTE_NAME on $(attrMetaFile) = $(attrName) ;
 	ATTRIBUTE_TYPE on $(attrMetaFile) = $(attrType) ;
-	MakeLocateArch $(attrMetaFile) ;
+	MakeLocateCommonPlatform $(attrMetaFile) ;
 	CreateAttributeMetaFile $(attrMetaFile) ;
 
 	Depends $(target) : <build>addattr $(attrMetaFile) $(dataFile) ;
diff --git a/build/jam/OptionalPackages b/build/jam/OptionalPackages
index d795cd81a1..1853e0c49b 100644
--- a/build/jam/OptionalPackages
+++ b/build/jam/OptionalPackages
@@ -184,8 +184,9 @@ if [ IsOptionalHaikuImagePackageAdded Welcome ] {
 
 	AddPackageFilesToHaikuImage system : haiku_welcome.hpkg : nameFromMetaInfo ;
 
-	AddSymlinkToHaikuImage home Desktop	: /boot/system/bin/welcome
-		: Welcome ;
+	AddSymlinkToHaikuImage home Desktop	: /boot/system/bin/quicktour
+		: Quick\ Tour ;
+
 	AddSymlinkToHaikuImage home Desktop	: /boot/system/bin/userguide
 		: User\ Guide ;
 }
diff --git a/build/jam/packages/HaikuWelcome b/build/jam/packages/HaikuWelcome
index 484d10d056..95837a450e 100644
--- a/build/jam/packages/HaikuWelcome
+++ b/build/jam/packages/HaikuWelcome
@@ -3,7 +3,9 @@ HaikuPackage $(haikuWelcomePackage) ;
 
 CopyDirectoryToPackage documentation : [ FDirName $(HAIKU_TOP) docs welcome ]
 	: welcome ;
+
 SEARCH on welcome = [ FDirName $(HAIKU_TOP) data bin ] ;
-AddFilesToPackage bin : welcome ;
+
+AddFilesToPackage bin : quicktour welcome ;
 
 BuildHaikuPackage $(haikuWelcomePackage) : haiku_welcome ;
diff --git a/src/apps/webpositive/bookmarks/WebPositiveBookmarks.zip b/src/apps/webpositive/bookmarks/WebPositiveBookmarks.zip
index c7cdffb75a..733b87ec73 100644
Binary files a/src/apps/webpositive/bookmarks/WebPositiveBookmarks.zip and b/src/apps/webpositive/bookmarks/WebPositiveBookmarks.zip differ
diff --git a/src/data/Jamfile b/src/data/Jamfile
index 5328196331..d54ec7d4a7 100644
--- a/src/data/Jamfile
+++ b/src/data/Jamfile
@@ -1,5 +1,6 @@
 SubDir HAIKU_TOP src data ;
 
+HaikuSubInclude bin ;
 HaikuSubInclude deskbar ;
 HaikuSubInclude keyboard_layouts ;
 HaikuSubInclude keymaps ;
diff --git a/src/data/bin/Alert_Idea.hvif b/src/data/bin/Alert_Idea.hvif
new file mode 100644
index 0000000000..6e5d129e74
Binary files /dev/null and b/src/data/bin/Alert_Idea.hvif differ
diff --git a/src/data/bin/Jamfile b/src/data/bin/Jamfile
new file mode 100644
index 0000000000..2a43682179
--- /dev/null
+++ b/src/data/bin/Jamfile
@@ -0,0 +1,16 @@
+SubDir HAIKU_TOP src data bin ;
+
+rule PrepareScriptWithIcon file : iconFile
+{
+	local source = [ FGristFiles $(file) ] ;
+	local icon = [ FGristFiles $(iconFile) ] ;
+	SEARCH on $(icon) = [ FDirName $(HAIKU_TOP) src data bin ] ;
+	local target = $(source:G=) ;
+	MakeLocateCommonPlatform $(target) ;
+	File $(target) : $(source) ;
+	MODE on $(target) = 755 ;
+	AddFileDataAttribute $(target) : BEOS:ICON : icon : $(icon) ;
+}
+
+PrepareScriptWithIcon quicktour : Alert_Idea.hvif ;
+PrepareScriptWithIcon userguide : Misc_Book.hvif ;
diff --git a/src/data/bin/Misc_Book.hvif b/src/data/bin/Misc_Book.hvif
new file mode 100644
index 0000000000..5f5d0a2b34
Binary files /dev/null and b/src/data/bin/Misc_Book.hvif differ
diff --git a/src/data/bin/quicktour b/src/data/bin/quicktour
new file mode 100755
index 0000000000..596be06184
--- /dev/null
+++ b/src/data/bin/quicktour
@@ -0,0 +1,16 @@
+#!/bin/sh
+
+quicktourURL="\
+	https://www.haiku-os.org/docs/welcome/en/quicktour.html"
+quicktourDir=/boot/system/documentation/welcome/en/
+quicktourFile=$quicktourDir/quicktour.html
+localizedQuicktourDir=/boot/system/documentation/welcome/"$LANG"/
+localizedQuicktourFile=$localizedQuicktourDir/quicktour.html
+
+if [ -f $localizedQuicktourFile ]; then
+	open file://$localizedQuicktourFile
+elif [ -f $quicktourFile ]; then
+	open $quicktourFile
+else
+	open $quicktourURL
+fi
diff --git a/data/bin/userguide b/src/data/bin/userguide
similarity index 100%
rename from data/bin/userguide
rename to src/data/bin/userguide
diff --git a/src/data/package_infos/any/haiku_welcome b/src/data/package_infos/any/haiku_welcome
index 6573c880d0..fef4dfb379 100644
--- a/src/data/package_infos/any/haiku_welcome
+++ b/src/data/package_infos/any/haiku_welcome
@@ -6,8 +6,10 @@ description		"The Haiku welcome documentation was put together especially \
 for new users. It provides information on how to report bugs and answers the \
 most pressing questions like how to find and install software, how to get in \
 contact and where to find more resources for programmers and endusers online.
+A quick tour of the system shows many of Haiku's distinguishing (and at times \
+not obvious) features.
 
-This package includes several translations of the welcome documentation. \
+This package includes several translations of the welcome documentation.
 Thanks to everyone who contributed!"
 
 packager		"The Haiku build system"