diff --git a/Applications/Picture Edit.app/Extensions/.rpic/Context menu.lua b/Applications/Picture Edit.app/Extensions/.rpic/Context menu.lua
new file mode 100644
index 00000000..d1ebe992
--- /dev/null
+++ b/Applications/Picture Edit.app/Extensions/.rpic/Context menu.lua	
@@ -0,0 +1,21 @@
+
+local filesystem = require("Filesystem")
+local GUI = require("GUI")
+local paths = require("Paths")
+local system = require("System")
+
+local workspace, icon, menu = select(1, ...), select(2, ...), select(3, ...)
+local localization = system.getSystemLocalization()
+
+menu:addItem(localization.setAsWallpaper).onTouch = function()
+	local userSettings = system.getUserSettings()
+
+	userSettings.interfaceWallpaperPath = icon.path
+	userSettings.interfaceWallpaperEnabled = true
+	system.updateWallpaper()
+	workspace:draw()
+
+	system.saveUserSettings()
+end
+
+system.addUploadToPastebinMenuItem(menu, icon.path)
diff --git a/Applications/Picture Edit.app/Extensions/.rpic/Icon.pic b/Applications/Picture Edit.app/Extensions/.rpic/Icon.pic
new file mode 100644
index 00000000..fbd9a371
Binary files /dev/null and b/Applications/Picture Edit.app/Extensions/.rpic/Icon.pic differ
diff --git a/Applications/Picture Edit.app/Main.lua b/Applications/Picture Edit.app/Main.lua
index aed64928..e36ddecd 100644
--- a/Applications/Picture Edit.app/Main.lua	
+++ b/Applications/Picture Edit.app/Main.lua	
@@ -298,7 +298,7 @@ end
 local function loadImage(path)
 	local result, reason
 	
-	if filesystem.extension(path) == ".rawpic" then
+	if filesystem.extension(path) == ".rpic" then
 		result = image.fromString(filesystem.read(path))
 	else
 		result, reason = image.load(path)
@@ -335,7 +335,7 @@ local function saveAs()
 	local filesystemDialog = GUI.addFilesystemDialog(workspace, true, 50, math.floor(window.height * 0.8), locale.save, locale.cancel, locale.fileName, "/")
 	filesystemDialog:setMode(GUI.IO_MODE_SAVE, GUI.IO_MODE_FILE)
 	filesystemDialog:addExtensionFilter(".pic")
-	filesystemDialog:addExtensionFilter(".rawpic")
+	filesystemDialog:addExtensionFilter(".rpic")
 	filesystemDialog:expandPath(paths.user.desktop)
 	filesystemDialog.filesystemTree.selectedItem = paths.user.desktop
 	filesystemDialog:show()