diff --git a/public/src/forum/admin/settings.js b/public/src/forum/admin/settings.js
index 8e8fc359df..44994930b6 100644
--- a/public/src/forum/admin/settings.js
+++ b/public/src/forum/admin/settings.js
@@ -75,13 +75,20 @@ define(['uploader'], function(uploader) {
 		});
 
 		$('#uploadLogoBtn').on('click', function() {
-
 			uploader.open(RELATIVE_PATH + '/admin/uploadlogo', function(image) {
 				$('#logoUrl').val(image);
 			});
 
 			uploader.hideAlerts();
 		});
+
+		$('#uploadLogoBtn').on('click', function() {
+			uploader.open(RELATIVE_PATH + '/admin/uploadfavicon', function() {
+				$('#favicon').attr('src', './../favicon.ico?v=' + new Date().getTime());
+			});
+
+			uploader.hideAlerts();
+		});
 	};
 
 	Settings.remove = function(key) {
diff --git a/public/templates/admin/settings.tpl b/public/templates/admin/settings.tpl
index a5e6192b1b..325d27a71b 100644
--- a/public/templates/admin/settings.tpl
+++ b/public/templates/admin/settings.tpl
@@ -12,11 +12,14 @@
 		<input type="text" class="form-control" placeholder="Keywords describing your community, comma-seperated" data-field="keywords" /><br />
 		<label>Site Logo</label>
 		<input id="logoUrl" type="text" class="form-control" placeholder="Path to a logo to display on forum header" data-field="brand:logo" /><br />
-		<input id="uploadLogoBtn" type="button" class="btn btn-default" value="Upload"></input> <br />
+		<input id="uploadLogoBtn" type="button" class="btn btn-default" value="Upload Logo"></input> <br />
 		<label>Imgur Client ID</label>
 		<input type="text" class="form-control" placeholder="Imgur ClientID for image uploads" data-field="imgurClientID" /><br />
 		<label>Maximum User Image Size</label>
-		<input type="text" class="form-control" placeholder="Maximum size of uploaded user images in kilobytes" data-field="maximumProfileImageSize" />
+		<input type="text" class="form-control" placeholder="Maximum size of uploaded user images in kilobytes" data-field="maximumProfileImageSize" /><br />
+		<label>Favicon</label><br />
+		<img src="./../favicon.ico" />&nbsp;
+		<input id="uploadFaviconBtn" type="button" class="btn btn-default" value="Upload Favicon"></input> <br />
 	</form>
 </div>