diff --git a/root/portal/includes/functions_upload.php b/root/portal/includes/functions_upload.php
index c4e81402..14026952 100644
--- a/root/portal/includes/functions_upload.php
+++ b/root/portal/includes/functions_upload.php
@@ -287,12 +287,26 @@ class portal_upload
 				return sprintf($user->lang['MODULE_UPLOAD_MKDIR_FAILURE'], $dirname_check);
 			}
 		}
+		
+		// leave a backup file if it already exists
+		if(file_exists($to))
+		{
+			// remove old backup file first
+			if(file_exists($to . '.bak'))
+			{
+				phpbb_chmod($to . '.bak', CHMOD_ALL);
+				unlink($to . '.bak');
+			}
+			rename($to, $to . '.bak');
+			phpbb_chmod($to, CHMOD_ALL);
+			unlink($to);
+		}
 
 		if (!@copy($from, $to))
 		{
 			return sprintf($user->lang['MODULE_COPY_FAILURE'], $to);
 		}
-		@chmod($to, octdec(0666));
+		@chmod($to, octdec(0644));
 
 		return true;
 	}
diff --git a/root/styles/subsilver2/template/portal/modules/stylechanger_side.html b/root/styles/subsilver2/template/portal/modules/stylechanger_side.html
index 8e1e918d..7d36d1e2 100644
--- a/root/styles/subsilver2/template/portal/modules/stylechanger_side.html
+++ b/root/styles/subsilver2/template/portal/modules/stylechanger_side.html
@@ -1,4 +1,4 @@
-<!-- IF S_STYLE_OPTIONS and S_DISPLAY_CHANGE_STYLE -->
+<!-- IF S_STYLE_OPTIONS -->
 {$LR_BLOCK_H_L}<!-- IF $S_BLOCK_ICON --><img src="{$IMAGE_SRC}" width="{$IMAGE_WIDTH}" height="{$IMAGE_HEIGHT}" alt="" />&nbsp;<!-- ENDIF -->{$TITLE}{$LR_BLOCK_H_R}
 <table class="tablebg" cellspacing="1" width="100%">
 	<tr class="row1">