diff --git a/plugins/wm_tweaks.py b/plugins/wm_tweaks.py
index 43d178fb..42dbabb6 100644
--- a/plugins/wm_tweaks.py
+++ b/plugins/wm_tweaks.py
@@ -6,22 +6,22 @@ lib_find_id  = libsaria.collection.lib_find_id
 lib_get_attr = libsaria.collection.lib_get_attr
 invite       = libsaria.event.invite
 
-def reset(*args):
-	ocarina.set_window_icon("images/ocarina.png")
-	ocarina.set_window_title(ocarina.__vers__)
 
 def tweak_icon(file):
 	if file != None:
 		ocarina.set_window_icon(file)
+	else:
+		ocarina.set_window_icon("images/ocarina.png")
 
 def tweak_title(filepath):
 	if filepath != None:
 		id = lib_find_id(filepath)
 		title = lib_get_attr(id, "title")
-		ocarina.set_window_title(title)
+	else:
+		title = ocarina.__vers__
+	ocarina.set_window_title(title)
 
 def start():
-	invite("PRELOAD", reset)
 	invite("POSTLOAD", tweak_title)
 	invite("POSTGETART", tweak_icon)