diff --git a/phpBB/develop/test.gif b/phpBB/develop/test.gif
new file mode 100644
index 0000000000..0dbc9b0459
Binary files /dev/null and b/phpBB/develop/test.gif differ
diff --git a/phpBB/images/icons/misc/fire.gif b/phpBB/images/icons/misc/fire.gif
index e436d6e8c9..4adba205e5 100644
Binary files a/phpBB/images/icons/misc/fire.gif and b/phpBB/images/icons/misc/fire.gif differ
diff --git a/phpBB/images/icons/misc/heart.gif b/phpBB/images/icons/misc/heart.gif
index c626dcb99f..c391c37433 100644
Binary files a/phpBB/images/icons/misc/heart.gif and b/phpBB/images/icons/misc/heart.gif differ
diff --git a/phpBB/images/icons/misc/radioactive.gif b/phpBB/images/icons/misc/radioactive.gif
index 517ae6397b..6d7527c03e 100644
Binary files a/phpBB/images/icons/misc/radioactive.gif and b/phpBB/images/icons/misc/radioactive.gif differ
diff --git a/phpBB/images/icons/misc/star.gif b/phpBB/images/icons/misc/star.gif
index dcde6eb66e..15a96ef87a 100644
Binary files a/phpBB/images/icons/misc/star.gif and b/phpBB/images/icons/misc/star.gif differ
diff --git a/phpBB/images/icons/misc/thinking.gif b/phpBB/images/icons/misc/thinking.gif
index fdec41bc19..23f226774d 100644
Binary files a/phpBB/images/icons/misc/thinking.gif and b/phpBB/images/icons/misc/thinking.gif differ
diff --git a/phpBB/images/icons/smile/alert.gif b/phpBB/images/icons/smile/alert.gif
index 024e2a969a..b0e1fe1737 100644
Binary files a/phpBB/images/icons/smile/alert.gif and b/phpBB/images/icons/smile/alert.gif differ
diff --git a/phpBB/images/icons/smile/info.gif b/phpBB/images/icons/smile/info.gif
index d715ac7c75..2b28d8c83a 100644
Binary files a/phpBB/images/icons/smile/info.gif and b/phpBB/images/icons/smile/info.gif differ
diff --git a/phpBB/images/icons/smile/mrgreen.gif b/phpBB/images/icons/smile/mrgreen.gif
index 9cd2715824..f6da47a117 100644
Binary files a/phpBB/images/icons/smile/mrgreen.gif and b/phpBB/images/icons/smile/mrgreen.gif differ
diff --git a/phpBB/images/icons/smile/question.gif b/phpBB/images/icons/smile/question.gif
index a07c038a9b..2c82028417 100644
Binary files a/phpBB/images/icons/smile/question.gif and b/phpBB/images/icons/smile/question.gif differ
diff --git a/phpBB/images/icons/smile/redface.gif b/phpBB/images/icons/smile/redface.gif
index 50e7ce3bfa..85c81f061c 100644
Binary files a/phpBB/images/icons/smile/redface.gif and b/phpBB/images/icons/smile/redface.gif differ
diff --git a/phpBB/styles/prosilver/theme/content.css b/phpBB/styles/prosilver/theme/content.css
index 82ec19202a..4639c4c7fe 100644
--- a/phpBB/styles/prosilver/theme/content.css
+++ b/phpBB/styles/prosilver/theme/content.css
@@ -137,15 +137,17 @@ li.header dl.row-item dt .list-inner {
 dl.row-item {
 	background-position: 10px 50%;		/* Position of folder icon */
 	background-repeat: no-repeat;
+	background-size: 32px;
 }
 
 dl.row-item dt {
 	background-position: 5px 95%;		/* Position of topic icon */
 	background-repeat: no-repeat;
+	background-size: 17px;
 }
 
 dl.row-item dt .list-inner {
-	padding-left: 45px;					/* Space for folder icon */
+	padding-left: 52px;					/* Space for folder icon */
 }
 
 dl.row-item dt,
diff --git a/phpBB/styles/prosilver/theme/images/announce_read.gif b/phpBB/styles/prosilver/theme/images/announce_read.gif
index 9457870e6f..b61cc54140 100644
Binary files a/phpBB/styles/prosilver/theme/images/announce_read.gif and b/phpBB/styles/prosilver/theme/images/announce_read.gif differ
diff --git a/phpBB/styles/prosilver/theme/images/announce_read_locked.gif b/phpBB/styles/prosilver/theme/images/announce_read_locked.gif
index 76ead8a02c..8c7393edf9 100644
Binary files a/phpBB/styles/prosilver/theme/images/announce_read_locked.gif and b/phpBB/styles/prosilver/theme/images/announce_read_locked.gif differ
diff --git a/phpBB/styles/prosilver/theme/images/announce_read_locked_mine.gif b/phpBB/styles/prosilver/theme/images/announce_read_locked_mine.gif
index 2105d21f10..e3f6e622a3 100644
Binary files a/phpBB/styles/prosilver/theme/images/announce_read_locked_mine.gif and b/phpBB/styles/prosilver/theme/images/announce_read_locked_mine.gif differ
diff --git a/phpBB/styles/prosilver/theme/images/announce_read_mine.gif b/phpBB/styles/prosilver/theme/images/announce_read_mine.gif
index 2c88cacca0..d57e5d04e5 100644
Binary files a/phpBB/styles/prosilver/theme/images/announce_read_mine.gif and b/phpBB/styles/prosilver/theme/images/announce_read_mine.gif differ
diff --git a/phpBB/styles/prosilver/theme/images/announce_unread.gif b/phpBB/styles/prosilver/theme/images/announce_unread.gif
index 33e10b2ccc..eb9edd1520 100644
Binary files a/phpBB/styles/prosilver/theme/images/announce_unread.gif and b/phpBB/styles/prosilver/theme/images/announce_unread.gif differ
diff --git a/phpBB/styles/prosilver/theme/images/announce_unread_locked.gif b/phpBB/styles/prosilver/theme/images/announce_unread_locked.gif
index 76dcc6ca71..054b0ae38d 100644
Binary files a/phpBB/styles/prosilver/theme/images/announce_unread_locked.gif and b/phpBB/styles/prosilver/theme/images/announce_unread_locked.gif differ
diff --git a/phpBB/styles/prosilver/theme/images/announce_unread_locked_mine.gif b/phpBB/styles/prosilver/theme/images/announce_unread_locked_mine.gif
index 53782fc3dc..a37b165b4f 100644
Binary files a/phpBB/styles/prosilver/theme/images/announce_unread_locked_mine.gif and b/phpBB/styles/prosilver/theme/images/announce_unread_locked_mine.gif differ
diff --git a/phpBB/styles/prosilver/theme/images/announce_unread_mine.gif b/phpBB/styles/prosilver/theme/images/announce_unread_mine.gif
index bc07df0ce9..55f649cc4b 100644
Binary files a/phpBB/styles/prosilver/theme/images/announce_unread_mine.gif and b/phpBB/styles/prosilver/theme/images/announce_unread_mine.gif differ
diff --git a/phpBB/styles/prosilver/theme/images/forum_link.gif b/phpBB/styles/prosilver/theme/images/forum_link.gif
index efeaf0a11f..42d445838b 100644
Binary files a/phpBB/styles/prosilver/theme/images/forum_link.gif and b/phpBB/styles/prosilver/theme/images/forum_link.gif differ
diff --git a/phpBB/styles/prosilver/theme/images/forum_read.gif b/phpBB/styles/prosilver/theme/images/forum_read.gif
index 845618c1a2..79d605ad7c 100644
Binary files a/phpBB/styles/prosilver/theme/images/forum_read.gif and b/phpBB/styles/prosilver/theme/images/forum_read.gif differ
diff --git a/phpBB/styles/prosilver/theme/images/forum_read_locked.gif b/phpBB/styles/prosilver/theme/images/forum_read_locked.gif
index 7afb092a8f..5eaf460a59 100644
Binary files a/phpBB/styles/prosilver/theme/images/forum_read_locked.gif and b/phpBB/styles/prosilver/theme/images/forum_read_locked.gif differ
diff --git a/phpBB/styles/prosilver/theme/images/forum_read_subforum.gif b/phpBB/styles/prosilver/theme/images/forum_read_subforum.gif
index 7119486539..b7b8176e4e 100644
Binary files a/phpBB/styles/prosilver/theme/images/forum_read_subforum.gif and b/phpBB/styles/prosilver/theme/images/forum_read_subforum.gif differ
diff --git a/phpBB/styles/prosilver/theme/images/forum_unread.gif b/phpBB/styles/prosilver/theme/images/forum_unread.gif
index 1a397cb216..8df11e7782 100644
Binary files a/phpBB/styles/prosilver/theme/images/forum_unread.gif and b/phpBB/styles/prosilver/theme/images/forum_unread.gif differ
diff --git a/phpBB/styles/prosilver/theme/images/forum_unread_locked.gif b/phpBB/styles/prosilver/theme/images/forum_unread_locked.gif
index 34f1d46ad7..63ac3fbedf 100644
Binary files a/phpBB/styles/prosilver/theme/images/forum_unread_locked.gif and b/phpBB/styles/prosilver/theme/images/forum_unread_locked.gif differ
diff --git a/phpBB/styles/prosilver/theme/images/forum_unread_subforum.gif b/phpBB/styles/prosilver/theme/images/forum_unread_subforum.gif
index e955887020..c5a2da1e31 100644
Binary files a/phpBB/styles/prosilver/theme/images/forum_unread_subforum.gif and b/phpBB/styles/prosilver/theme/images/forum_unread_subforum.gif differ
diff --git a/phpBB/styles/prosilver/theme/images/sticky_read.gif b/phpBB/styles/prosilver/theme/images/sticky_read.gif
index e1af585da5..c56a3833f9 100644
Binary files a/phpBB/styles/prosilver/theme/images/sticky_read.gif and b/phpBB/styles/prosilver/theme/images/sticky_read.gif differ
diff --git a/phpBB/styles/prosilver/theme/images/sticky_read_locked.gif b/phpBB/styles/prosilver/theme/images/sticky_read_locked.gif
index 79f581be79..854a8f06de 100644
Binary files a/phpBB/styles/prosilver/theme/images/sticky_read_locked.gif and b/phpBB/styles/prosilver/theme/images/sticky_read_locked.gif differ
diff --git a/phpBB/styles/prosilver/theme/images/sticky_read_locked_mine.gif b/phpBB/styles/prosilver/theme/images/sticky_read_locked_mine.gif
index ad056086e5..0d559c0767 100644
Binary files a/phpBB/styles/prosilver/theme/images/sticky_read_locked_mine.gif and b/phpBB/styles/prosilver/theme/images/sticky_read_locked_mine.gif differ
diff --git a/phpBB/styles/prosilver/theme/images/sticky_read_mine.gif b/phpBB/styles/prosilver/theme/images/sticky_read_mine.gif
index 8f5f28fe5e..3cd077355a 100644
Binary files a/phpBB/styles/prosilver/theme/images/sticky_read_mine.gif and b/phpBB/styles/prosilver/theme/images/sticky_read_mine.gif differ
diff --git a/phpBB/styles/prosilver/theme/images/sticky_unread.gif b/phpBB/styles/prosilver/theme/images/sticky_unread.gif
index d62b3c0f3a..0d201657e3 100644
Binary files a/phpBB/styles/prosilver/theme/images/sticky_unread.gif and b/phpBB/styles/prosilver/theme/images/sticky_unread.gif differ
diff --git a/phpBB/styles/prosilver/theme/images/sticky_unread_locked.gif b/phpBB/styles/prosilver/theme/images/sticky_unread_locked.gif
index 5792b8649a..4535708752 100644
Binary files a/phpBB/styles/prosilver/theme/images/sticky_unread_locked.gif and b/phpBB/styles/prosilver/theme/images/sticky_unread_locked.gif differ
diff --git a/phpBB/styles/prosilver/theme/images/sticky_unread_locked_mine.gif b/phpBB/styles/prosilver/theme/images/sticky_unread_locked_mine.gif
index 93495770c8..bb14033781 100644
Binary files a/phpBB/styles/prosilver/theme/images/sticky_unread_locked_mine.gif and b/phpBB/styles/prosilver/theme/images/sticky_unread_locked_mine.gif differ
diff --git a/phpBB/styles/prosilver/theme/images/sticky_unread_mine.gif b/phpBB/styles/prosilver/theme/images/sticky_unread_mine.gif
index e201a9f31f..c7ae656f02 100644
Binary files a/phpBB/styles/prosilver/theme/images/sticky_unread_mine.gif and b/phpBB/styles/prosilver/theme/images/sticky_unread_mine.gif differ
diff --git a/phpBB/styles/prosilver/theme/images/topic_moved.gif b/phpBB/styles/prosilver/theme/images/topic_moved.gif
index 3dafa46ed7..707b9f5d3d 100644
Binary files a/phpBB/styles/prosilver/theme/images/topic_moved.gif and b/phpBB/styles/prosilver/theme/images/topic_moved.gif differ
diff --git a/phpBB/styles/prosilver/theme/images/topic_read.gif b/phpBB/styles/prosilver/theme/images/topic_read.gif
index 640d5396f8..a3b706eb11 100644
Binary files a/phpBB/styles/prosilver/theme/images/topic_read.gif and b/phpBB/styles/prosilver/theme/images/topic_read.gif differ
diff --git a/phpBB/styles/prosilver/theme/images/topic_read_hot.gif b/phpBB/styles/prosilver/theme/images/topic_read_hot.gif
index dcb6f3bd60..d118fdcc4f 100644
Binary files a/phpBB/styles/prosilver/theme/images/topic_read_hot.gif and b/phpBB/styles/prosilver/theme/images/topic_read_hot.gif differ
diff --git a/phpBB/styles/prosilver/theme/images/topic_read_hot_mine.gif b/phpBB/styles/prosilver/theme/images/topic_read_hot_mine.gif
index 1e5498a9be..2e16f96e33 100644
Binary files a/phpBB/styles/prosilver/theme/images/topic_read_hot_mine.gif and b/phpBB/styles/prosilver/theme/images/topic_read_hot_mine.gif differ
diff --git a/phpBB/styles/prosilver/theme/images/topic_read_locked.gif b/phpBB/styles/prosilver/theme/images/topic_read_locked.gif
index a47affb2f2..3154d38463 100644
Binary files a/phpBB/styles/prosilver/theme/images/topic_read_locked.gif and b/phpBB/styles/prosilver/theme/images/topic_read_locked.gif differ
diff --git a/phpBB/styles/prosilver/theme/images/topic_read_locked_mine.gif b/phpBB/styles/prosilver/theme/images/topic_read_locked_mine.gif
index d6142f0ea7..ac0248c2be 100644
Binary files a/phpBB/styles/prosilver/theme/images/topic_read_locked_mine.gif and b/phpBB/styles/prosilver/theme/images/topic_read_locked_mine.gif differ
diff --git a/phpBB/styles/prosilver/theme/images/topic_read_mine.gif b/phpBB/styles/prosilver/theme/images/topic_read_mine.gif
index 18a1245b93..b0e9455d0e 100644
Binary files a/phpBB/styles/prosilver/theme/images/topic_read_mine.gif and b/phpBB/styles/prosilver/theme/images/topic_read_mine.gif differ
diff --git a/phpBB/styles/prosilver/theme/images/topic_unread.gif b/phpBB/styles/prosilver/theme/images/topic_unread.gif
index 3fa920b6fc..de500726ec 100644
Binary files a/phpBB/styles/prosilver/theme/images/topic_unread.gif and b/phpBB/styles/prosilver/theme/images/topic_unread.gif differ
diff --git a/phpBB/styles/prosilver/theme/images/topic_unread_hot.gif b/phpBB/styles/prosilver/theme/images/topic_unread_hot.gif
index e712f6e827..1937164e08 100644
Binary files a/phpBB/styles/prosilver/theme/images/topic_unread_hot.gif and b/phpBB/styles/prosilver/theme/images/topic_unread_hot.gif differ
diff --git a/phpBB/styles/prosilver/theme/images/topic_unread_hot_mine.gif b/phpBB/styles/prosilver/theme/images/topic_unread_hot_mine.gif
index fa8b167c64..28fdd88f4b 100644
Binary files a/phpBB/styles/prosilver/theme/images/topic_unread_hot_mine.gif and b/phpBB/styles/prosilver/theme/images/topic_unread_hot_mine.gif differ
diff --git a/phpBB/styles/prosilver/theme/images/topic_unread_locked.gif b/phpBB/styles/prosilver/theme/images/topic_unread_locked.gif
index 0a9768ba7d..177dae74f4 100644
Binary files a/phpBB/styles/prosilver/theme/images/topic_unread_locked.gif and b/phpBB/styles/prosilver/theme/images/topic_unread_locked.gif differ
diff --git a/phpBB/styles/prosilver/theme/images/topic_unread_locked_mine.gif b/phpBB/styles/prosilver/theme/images/topic_unread_locked_mine.gif
index 916b60517e..2b6b854e33 100644
Binary files a/phpBB/styles/prosilver/theme/images/topic_unread_locked_mine.gif and b/phpBB/styles/prosilver/theme/images/topic_unread_locked_mine.gif differ
diff --git a/phpBB/styles/prosilver/theme/images/topic_unread_mine.gif b/phpBB/styles/prosilver/theme/images/topic_unread_mine.gif
index 4ca8492e74..fd16eeedef 100644
Binary files a/phpBB/styles/prosilver/theme/images/topic_unread_mine.gif and b/phpBB/styles/prosilver/theme/images/topic_unread_mine.gif differ
diff --git a/tests/functional/fileupload_remote_test.php b/tests/functional/fileupload_remote_test.php
index b70d49cddd..88f8999005 100644
--- a/tests/functional/fileupload_remote_test.php
+++ b/tests/functional/fileupload_remote_test.php
@@ -100,8 +100,8 @@ class phpbb_functional_fileupload_remote_test extends phpbb_functional_test_case
 		$upload = new \phpbb\files\upload($this->filesystem, $this->factory, $this->language, $this->php_ini, $this->request, $this->phpbb_root_path);
 		$upload->set_error_prefix('')
 			->set_allowed_extensions(array('gif'))
-			->set_max_filesize(1000);
-		$file = $upload->handle_upload('files.types.remote', self::$root_url . 'styles/prosilver/theme/images/forum_read.gif');
+			->set_max_filesize(2000);
+		$file = $upload->handle_upload('files.types.remote', self::$root_url . 'develop/test.gif');
 		$this->assertEquals(0, sizeof($file->error));
 		$this->assertTrue(file_exists($file->get('filename')));
 		$this->assertTrue($file->is_uploaded());
@@ -114,7 +114,7 @@ class phpbb_functional_fileupload_remote_test extends phpbb_functional_test_case
 		$upload->set_error_prefix('')
 			->set_allowed_extensions(array('gif'))
 			->set_max_filesize(100);
-		$file = $upload->handle_upload('files.types.remote', self::$root_url . 'styles/prosilver/theme/images/forum_read.gif');
+		$file = $upload->handle_upload('files.types.remote', self::$root_url . 'develop/test.gif');
 		$this->assertEquals(1, sizeof($file->error));
 		$this->assertEquals('WRONG_FILESIZE', $file->error[0]);
 	}