diff --git a/install/tpl/config.inc.php.master b/install/tpl/config.inc.php.master
index 28339e7c2a6fd4e20a38c9903a84591394a762da..8dc141f21183d87ff523218a9e09e54a39fbe752 100644
--- a/install/tpl/config.inc.php.master
+++ b/install/tpl/config.inc.php.master
@@ -146,7 +146,7 @@ $conf['software_updates_enabled'] = false;
 //** Themes
 $conf['theme'] = 'default';
 $conf['html_content_encoding'] = 'utf-8'; // example: utf-8, iso-8859-1, ...
-$conf['logo'] = 'themes/default/images/ispc_logo.png';
+$conf['logo'] = 'themes/default/images/header_logo.png';
 
 //** Default Language and Timezone
 $conf['language'] = '{language}';
diff --git a/interface/lib/app.inc.php b/interface/lib/app.inc.php
index 060472b74bb0c41ad008beb56754147e7489c162..a228ba0b47bb7cef9d9f98828b6064de2785159e 100644
--- a/interface/lib/app.inc.php
+++ b/interface/lib/app.inc.php
@@ -217,11 +217,14 @@ class app {
 			$this->tpl->setVar('app_version', '');
 		}
 		$this->tpl->setVar('app_link', $this->_conf['app_link']);
+		/*
 		if(isset($this->_conf['app_logo']) && $this->_conf['app_logo'] != '' && @is_file($this->_conf['app_logo'])) {
 			$this->tpl->setVar('app_logo', '<img src="'.$this->_conf['app_logo'].'">');
 		} else {
 			$this->tpl->setVar('app_logo', '&nbsp;');
 		}
+		*/
+		$this->tpl->setVar('app_logo', $this->_conf['logo']);
 
 		$this->tpl->setVar('phpsessid', session_id());
 
diff --git a/interface/lib/config.inc.php b/interface/lib/config.inc.php
index 40de4325900de4c360a86e5278b848af8cec687d..3cd1723c2e8d91d736997badb569751fc008ff52 100644
--- a/interface/lib/config.inc.php
+++ b/interface/lib/config.inc.php
@@ -131,7 +131,7 @@ $conf['software_updates_enabled'] = false;
 //** Themes
 $conf['theme'] = 'default';
 $conf['html_content_encoding'] = 'utf-8'; // example: utf-8, iso-8859-1, ...
-$conf['logo'] = 'themes/default/images/ispc_logo.png';
+$conf['logo'] = 'themes/default/images/header_logo.png';
 
 //** Templates
 $conf['templates'] = '/usr/local/ispconfig/server/conf';
diff --git a/interface/web/themes/default/templates/main.tpl.htm b/interface/web/themes/default/templates/main.tpl.htm
index 0152727a49136f7e22578fd21c4bf0bf909fc25f..aa4ec170096ad973c8495aa18d9aa45dd95fc57f 100644
--- a/interface/web/themes/default/templates/main.tpl.htm
+++ b/interface/web/themes/default/templates/main.tpl.htm
@@ -108,7 +108,7 @@
                     <span><a href="#logout" onclick="loadContent('login/logout.php');"><tmpl_var name="logout_txt"> <tmpl_var format="strtoupper" name="cpuser"></a><!-- | <a href="#" onclick="capp('help')">Help</a> | <a href="#">Imprint</a>--></span>
 			        </tmpl_if>
                 </div>
-                <h1 id="ir-HeaderLogo" class="swap"><span>ISPConfig 3</span></h1>
+                <h1 id="ir-HeaderLogo" class="swap" style="background-image:url('{tmpl_var name='app_logo'}');"><span>ISPConfig 3</span></h1>
                 <span>hosting control panel</span>
             </div>
             <!-- begin: main navigation #nav -->
diff --git a/interface/web/themes/default_64_navimg/templates/main.tpl.htm b/interface/web/themes/default_64_navimg/templates/main.tpl.htm
index 35e23db027d3fd196fe93724349af0e7b993f601..c90c9f225a13f81580c01c8608eaa0a2fe1140fc 100644
--- a/interface/web/themes/default_64_navimg/templates/main.tpl.htm
+++ b/interface/web/themes/default_64_navimg/templates/main.tpl.htm
@@ -107,7 +107,7 @@
                     <span><a href="#logout" onclick="loadContent('login/logout.php');">LOGOUT <tmpl_var format="strtoupper" name="cpuser"></a><!-- | <a href="#" onclick="capp('help')">Help</a> | <a href="#">Imprint</a>--></span>
 			        </tmpl_if>
                 </div>
-                <h1 id="ir-HeaderLogo" class="swap"><span>ISPConfig 3</span></h1>
+                <h1 id="ir-HeaderLogo" class="swap" style="background-image:url('{tmpl_var name='app_logo'}');"><span>ISPConfig 3</span></h1>
                 <span>hosting control panel</span>
             </div>
             <!-- begin: main navigation #nav -->
diff --git a/interface/web/themes/default_combobox/templates/main.tpl.htm b/interface/web/themes/default_combobox/templates/main.tpl.htm
index a9d7ca6079b82343c06ebba9fc974ee119624e90..6fe98a4de383ad4dfaff19c1268b6cb19b53ded1 100644
--- a/interface/web/themes/default_combobox/templates/main.tpl.htm
+++ b/interface/web/themes/default_combobox/templates/main.tpl.htm
@@ -240,7 +240,7 @@
                     <span><a href="#logout" onclick="loadContent('login/logout.php');">LOGOUT <tmpl_var format="strtoupper" name="cpuser"></a><!-- | <a href="#" onclick="capp('help')">Help</a> | <a href="#">Imprint</a>--></span>
 			        </tmpl_if>
                 </div>
-                <h1 id="ir-HeaderLogo" class="swap"><span>ISPConfig 3</span></h1>
+                <h1 id="ir-HeaderLogo" class="swap" style="background-image:url('{tmpl_var name='app_logo'}');"><span>ISPConfig 3</span></h1>
                 <span>hosting control panel</span>
             </div>
             <!-- begin: main navigation #nav -->
diff --git a/interface/web/themes/default_no_navimg/templates/main.tpl.htm b/interface/web/themes/default_no_navimg/templates/main.tpl.htm
index 93f096ee746ee964f33347168ade97db46deaa48..ff939af3feca62bf670796bfa30b5d3d27de96fb 100644
--- a/interface/web/themes/default_no_navimg/templates/main.tpl.htm
+++ b/interface/web/themes/default_no_navimg/templates/main.tpl.htm
@@ -108,7 +108,7 @@
                     <span><a href="#logout" onclick="loadContent('login/logout.php');">LOGOUT <tmpl_var format="strtoupper" name="cpuser"></a><!-- | <a href="#" onclick="capp('help')">Help</a> | <a href="#">Imprint</a>--></span>
 			        </tmpl_if>
                 </div>
-                <h1 id="ir-HeaderLogo" class="swap"><span>ISPConfig 3</span></h1>
+                <h1 id="ir-HeaderLogo" class="swap" style="background-image:url('{tmpl_var name='app_logo'}');"><span>ISPConfig 3</span></h1>
                 <span>hosting control panel</span>
             </div>
             <!-- begin: main navigation #nav -->