diff --git a/app/edit/index.php b/app/edit/index.php
index 80eb11745e..1cd12b326a 100644
--- a/app/edit/index.php
+++ b/app/edit/index.php
@@ -59,12 +59,22 @@ else {
 	$setting_indenting = ($_SESSION["editor"]["indent_guides"]["boolean"] != '') ? $_SESSION["editor"]["indent_guides"]["boolean"] : 'false';
 	$setting_numbering = ($_SESSION["editor"]["line_numbers"]["boolean"] != '') ? $_SESSION["editor"]["line_numbers"]["boolean"] : 'true';
 	$setting_preview = ($_SESSION["editor"]["live_preview"]["boolean"] != '') ? $_SESSION["editor"]["live_preview"]["boolean"] : 'true';
+
+//get and then set the favicon
+	if (isset($_SESSION['theme']['favicon']['text'])){
+		$favicon = $_SESSION['theme']['favicon']['text'];
+	}
+	else {
+		$favicon = '<!--{project_path}-->/themes/enhanced/favicon.ico';
+	}
+
 ?>
 
 <html>
 <head>
 	<meta http-equiv='Content-Type' content='text/html; charset=UTF-8' />
-	<title><?php echo $title;?></title>
+	<title><?php echo $title; ?></title>
+	<link rel="icon" type="image/x-icon" href="<?php echo $favicon; ?>">
 	<script language="JavaScript" type="text/javascript" src="<?php echo PROJECT_PATH; ?>/resources/jquery/jquery-1.11.1.js"></script>
 	<script language="JavaScript" type="text/javascript">
 		function submit_check() {
diff --git a/themes/enhanced/template.php b/themes/enhanced/template.php
index 1ff8bd9091..f881e95ed4 100644
--- a/themes/enhanced/template.php
+++ b/themes/enhanced/template.php
@@ -38,7 +38,7 @@
 	}
 	else {
 		$favicon = '<!--{project_path}-->/themes/enhanced/favicon.ico';
-        }
+	}
 ?>
 <link rel="icon" href="<?php echo $favicon; ?>">
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
diff --git a/themes/minimized/template.php b/themes/minimized/template.php
index 6cbc4f4c66..9212e98e54 100644
--- a/themes/minimized/template.php
+++ b/themes/minimized/template.php
@@ -38,7 +38,7 @@
 	}
 	else {
 		$favicon = '<!--{project_path}-->/themes/minimized/favicon.ico';
-        }
+	}
 ?>
 <link rel="icon" href="<?php echo $favicon; ?>">
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
