From 750ed29ac953cc6feaedd4f60cb1e106e52e9ad7 Mon Sep 17 00:00:00 2001
From: fermin831 <fermin.hernandez@artica.es>
Date: Thu, 24 May 2018 16:59:50 +0200
Subject: [PATCH] [Rebranding] Added a header to white backgrounds and make the
 favicon and the mobile console configurable

---
 pandora_console/extras/mr/16.sql              |   1 +
 .../pandoradb_migrate_6.0_to_7.0.mysql.sql    |   1 +
 pandora_console/general/pandora_help.php      |   2 +-
 pandora_console/godmode/setup/license.php     |   2 +-
 .../godmode/setup/setup_visuals.php           |  86 +++++++++++++++++-
 .../images/custom_favicon/favicon_meta.ico    | Bin 0 -> 1150 bytes
 .../images/custom_favicon/pandora.ico         | Bin 0 -> 1150 bytes
 .../pandora_logo_head_white_bg.png            | Bin 0 -> 4341 bytes
 .../pandora_logo_head_white_bg_2.png          | Bin 0 -> 4198 bytes
 pandora_console/include/functions_config.php  |  24 ++++-
 pandora_console/include/functions_ui.php      |  52 +++++++++--
 pandora_console/mobile/include/user.class.php |   8 +-
 .../operation/events/events_marquee.php       |   2 +-
 .../operation/events/sound_events.php         |   2 +-
 pandora_console/pandoradb_data.sql            |   3 +-
 15 files changed, 158 insertions(+), 25 deletions(-)
 create mode 100644 pandora_console/images/custom_favicon/favicon_meta.ico
 create mode 100644 pandora_console/images/custom_favicon/pandora.ico
 create mode 100755 pandora_console/images/custom_logo/pandora_logo_head_white_bg.png
 create mode 100644 pandora_console/images/custom_logo/pandora_logo_head_white_bg_2.png

diff --git a/pandora_console/extras/mr/16.sql b/pandora_console/extras/mr/16.sql
index 354d3377f2..65bbe43c7d 100644
--- a/pandora_console/extras/mr/16.sql
+++ b/pandora_console/extras/mr/16.sql
@@ -2,6 +2,7 @@ START TRANSACTION;
 
 INSERT INTO `tconfig` (`token`, `value`) VALUES ('custom_docs_logo', 'default_docs.png');
 INSERT INTO `tconfig` (`token`, `value`) VALUES ('custom_support_logo', 'default_support.png');
+INSERT INTO `tconfig` (`token`, `value`) VALUES ('custom_logo_white_bg_preview', 'pandora_logo_head_white_bg.png');
 
 UPDATE talert_actions SET name='Monitoring&#x20;Event' WHERE name='Pandora&#x20;FMS&#x20;Event';
 
diff --git a/pandora_console/extras/pandoradb_migrate_6.0_to_7.0.mysql.sql b/pandora_console/extras/pandoradb_migrate_6.0_to_7.0.mysql.sql
index 551225e14d..436081f2b1 100644
--- a/pandora_console/extras/pandoradb_migrate_6.0_to_7.0.mysql.sql
+++ b/pandora_console/extras/pandoradb_migrate_6.0_to_7.0.mysql.sql
@@ -1163,6 +1163,7 @@ INSERT INTO `tconfig` (`token`, `value`) VALUES ('days_autodisable_deletion', '3
 INSERT INTO `tconfig` (`token`, `value`) VALUES ('MR', 13);
 INSERT INTO `tconfig` (`token`, `value`) VALUES ('custom_docs_logo', 'default_docs.png');
 INSERT INTO `tconfig` (`token`, `value`) VALUES ('custom_support_logo', 'default_support.png');
+INSERT INTO `tconfig` (`token`, `value`) VALUES ('custom_logo_white_bg_preview', 'pandora_logo_head_white_bg.png');
 UPDATE tconfig SET value = 'https://licensing.artica.es/pandoraupdate7/server.php' WHERE token='url_update_manager';
 DELETE FROM `tconfig` WHERE `token` = 'current_package_enterprise';
 INSERT INTO `tconfig` (`token`, `value`) VALUES ('current_package_enterprise', '720');
diff --git a/pandora_console/general/pandora_help.php b/pandora_console/general/pandora_help.php
index fa1696370c..72ed4ec827 100644
--- a/pandora_console/general/pandora_help.php
+++ b/pandora_console/general/pandora_help.php
@@ -61,7 +61,7 @@ foreach ($files as $file) {
 	}
 }
 
-$logo = ui_get_custom_header_logo();
+$logo = ui_get_custom_header_logo(true);
 
 if (! $id || ! file_exists ($help_file)) {
 	echo '<div id="main_help" style="background-color: #fff;text-align:center; padding-top: 15px; padding-bottom: 15px; ">';
diff --git a/pandora_console/godmode/setup/license.php b/pandora_console/godmode/setup/license.php
index ecff0c27ce..a772c0e015 100644
--- a/pandora_console/godmode/setup/license.php
+++ b/pandora_console/godmode/setup/license.php
@@ -103,7 +103,7 @@ if (enterprise_installed()) {
 echo '</form>';
 echo '<div id="code_license_dialog" style="display: none; text-align: left;" title="' . __('Request new license') . '">';
 echo '<div id="logo">';
-html_print_image(ui_get_custom_header_logo());
+html_print_image(ui_get_custom_header_logo(true));
 echo '</div>';
 echo '' . __('To get your <b>%s Enterprise License</b>:', get_product_name()) . '<br />';
 echo '<ul>';
diff --git a/pandora_console/godmode/setup/setup_visuals.php b/pandora_console/godmode/setup/setup_visuals.php
index c885b1f2cc..dfa3758309 100755
--- a/pandora_console/godmode/setup/setup_visuals.php
+++ b/pandora_console/godmode/setup/setup_visuals.php
@@ -179,6 +179,32 @@ if(!enterprise_installed()){
 	$open=true; 
 }
 
+// Custom favicon
+$files = list_files('images/custom_favicon', "ico", 1, 0);
+$table_styles->data[$row][0] = __('Custom favicon');
+$table_styles->data[$row][0] .= ui_print_help_tip(__('You can place your favicon into the folder images/custom_favicon/. This file should be in .ico format with a size of 16x16.'), true);
+$table_styles->data[$row][1] = html_print_select(
+	$files,
+	'custom_favicon',
+	$config["custom_favicon"],
+	'setup_visuals_change_favicon();',
+	__('Default'),
+	'',
+	true,
+	false,
+	true,
+	'',
+	false,
+	'width:240px'
+);
+$table_styles->data[$row][1] .= "&nbsp;&nbsp;&nbsp;" . html_print_image(
+	ui_get_favicon(),
+	true,
+	array('id' => 'favicon_preview')
+);
+$row++;
+
+$table_styles->data[$row][0] = __('Custom background logo');
 $table_styles->data[$row][1] = html_print_select ($backgrounds_list,
 	'login_background', $config["login_background"], '', __('Default'),
 	'', true,false,true,'',false,'width:240px');
@@ -187,7 +213,6 @@ $table_styles->data[$row][1] .= "&nbsp;" .
 $row++;
 
 $table_styles->data[$row][0] = __('Custom logo (header)') . ui_print_help_icon("custom_logo", true);
-
 if(enterprise_installed()){
 	$ent_files = list_files('enterprise/images/custom_logo', "png", 1, 0);
 	$open_files = list_files('images/custom_logo', "png", 1, 0);
@@ -201,8 +226,24 @@ else{
 	list_files('images/custom_logo', "png", 1, 0), 'custom_logo',
 	$config["custom_logo"], '', '', '',true,false,true,'',$open,'width:240px');
 }
+$table_styles->data[$row][1] .= "&nbsp;" . html_print_button(__("View"), 'custom_logo_preview', $open, '', 'class="sub camera logo_preview"', true,false,$open,'visualmodal');
+$row++;
+
+$table_styles->data[$row][0] = __('Custom logo (header white background)');
+if(enterprise_installed()){
+	$ent_files = list_files('enterprise/images/custom_logo', "png", 1, 0);
+	$open_files = list_files('images/custom_logo', "png", 1, 0);
 	
-	$table_styles->data[$row][1] .= "&nbsp;" . html_print_button(__("View"), 'custom_logo_preview', $open, '', 'class="sub camera logo_preview"', true,false,$open,'visualmodal');
+	$table_styles->data[$row][1] = html_print_select(
+	array_merge($open_files, $ent_files), 'custom_logo_white_bg',
+	$config["custom_logo_white_bg"], '', '', '',true,false,true,'',$open,'width:240px');
+}
+else{
+	$table_styles->data[$row][1] = html_print_select(
+	list_files('images/custom_logo', "png", 1, 0), 'custom_logo_white_bg',
+	$config["custom_logo_white_bg"], '', '', '',true,false,true,'',$open,'width:240px');
+}
+$table_styles->data[$row][1] .= "&nbsp;" . html_print_button(__("View"), 'custom_logo_white_bg_preview', $open, '', 'class="sub camera logo_preview"', true,false,$open,'visualmodal');
 $row++;
 
 $table_styles->data[$row][0] = __('Custom logo (login)') . ui_print_help_icon("custom_logo", true);
@@ -230,7 +271,6 @@ if(enterprise_installed()) {
 		$config["custom_splash_login"], '', '', '',true,false,true,'',$open,'width:240px');
 
 	$table_styles->data[$row][1] .= "&nbsp;" . html_print_button(__("View"), 'custom_splash_login_preview', $open, '', 'class="sub camera logo_preview"', true,false,$open,'visualmodal');
-	
 	$row++;
 }
 
@@ -298,6 +338,26 @@ if(enterprise_installed()){
 	);
 	$table_styles->data[$row][1] .= "&nbsp;" . html_print_button(__("View"), 'custom_network_center_logo_preview', $open, '', 'class="sub camera logo_preview"', true,false,$open,'visualmodal');
 	$row++;
+
+	// Custom center mobile console icon
+	$table_styles->data[$row][0] = __('Custom mobile console icon');
+	$table_styles->data[$row][0] .= ui_print_help_tip(__('You can place your custom logos into the folder enterprise/images/custom_general_logos/'), true);
+	$table_styles->data[$row][1] = html_print_select(
+		$files,
+		'custom_mobile_console_logo',
+		$config["custom_mobile_console_logo"],
+		'',
+		__('Default'),
+		'',
+		true,
+		false,
+		true,
+		'',
+		false,
+		'width:240px'
+	);
+	$table_styles->data[$row][1] .= "&nbsp;" . html_print_button(__("View"), 'custom_mobile_console_logo_preview', $open, '', 'class="sub camera logo_preview"', true,false,$open,'visualmodal');
+	$row++;
 }
 
 //login title1
@@ -1135,13 +1195,22 @@ $(document).ready (function () {
 	});
 });
 
+// Change the favicon preview when is changed
+function setup_visuals_change_favicon(meta) {
+	var icon_name = $("select#custom_favicon option:selected").val();
+	var icon_path = (icon_name == "")
+		? "images/pandora.ico"
+		: "images/custom_favicon/" + icon_name;
+	$("#favicon_preview").attr("src", "<?php echo $config['homeurl'];?>" + icon_path);
+}
+
 // Dialog loaders for the images previews
 $(".logo_preview").click (function(e) {
 	// Init the vars
 	var icon_name = '';
 	var icon_path = '';
 	var options = {
-		title: "<?php echo __('Logo preview!'); ?>"
+		title: "<?php echo __('Logo preview'); ?>"
 	};
 
 	// Fill it seing the target has been clicked
@@ -1151,6 +1220,10 @@ $(".logo_preview").click (function(e) {
 			icon_path = "<?php echo $config['homeurl'];  if(enterprise_installed){ echo 'enterprise/'; } ?>images/custom_logo/" + icon_name;
 			options.grayed = true;
 			break;
+		case 'button-custom_logo_white_bg_preview':
+			icon_name = $("select#custom_logo_white_bg option:selected").val();
+			icon_path = "<?php echo $config['homeurl'];  if(enterprise_installed){ echo 'enterprise/'; } ?>images/custom_logo/" + icon_name;
+			break;
 		case 'button-custom_logo_login_preview':
 			icon_name = $("select#custom_logo_login option:selected").val();
 			icon_path = "<?php echo $config['homeurl']; if(enterprise_installed){ echo 'enterprise/'; } ?>images/custom_logo_login/" + icon_name;
@@ -1175,6 +1248,11 @@ $(".logo_preview").click (function(e) {
 			icon_name = $("select#custom_network_center_logo option:selected").val();
 			icon_path = "<?php echo $config['homeurl']; ?>enterprise/images/custom_general_logos/" + icon_name;
 			break;
+		case 'button-custom_mobile_console_logo_preview':
+			icon_name = $("select#custom_mobile_console_logo option:selected").val();
+			icon_path = "<?php echo $config['homeurl']; ?>enterprise/images/custom_general_logos/" + icon_name;
+			options.title = "<?php echo __('Mobile console logo preview'); ?>";
+			break;
 		case 'button-login_background_preview':
 			icon_name = $("select#login_background option:selected").val();
 			icon_path = "<?php echo $config['homeurl']; ?>/images/backgrounds/" + icon_name;
diff --git a/pandora_console/images/custom_favicon/favicon_meta.ico b/pandora_console/images/custom_favicon/favicon_meta.ico
new file mode 100644
index 0000000000000000000000000000000000000000..71713c757fd482eb950f3021672f4cf5ebd544bc
GIT binary patch
literal 1150
zcmb_aJxc>Y5S^f4=~dR2R(gI!ji#{BLJ$cGHYqI91hi1ZLIgQd+6b052X>a0R`DO?
zCnWzMmUioVo110a<P^a>-tFw}yf<(5R-}SANd(_{X-|vHiO2$gC9I6rF^FLAw`aRv
zPk;>Q1I}QGI0w=)4ekNVv%E?1MXd1$uIhc$0Kd1jyW<G0zu7!=Yn_%`e!BD{=ek#n
zz8Ay|&a1blZvE`UYjCU`?}vQqR<D|F^}Zd}z{%MMNAlB`8(+(M;JO7hs9mfL3x1dL
z#kY>f1fQDkxW|4})ACmy&pn?$$~<hej!OCDq|eu0BkD8M<37(Rs{f$#SVMi(4)(lu
z<gH)$=e-G<<giDc2lMHfXU2bN{|Pu5`Fs!u52{6u_OtYQ=QWLY-qU2n_I%#^o^tI-
zKRkC+n_Pc)lwWwD#+VPQg_t$QxRDOegF0P<9C5?u{YU&UBQls0d9MHv%zgm(naBLk
JSrO+%z5pN8UXuU-

literal 0
HcmV?d00001

diff --git a/pandora_console/images/custom_favicon/pandora.ico b/pandora_console/images/custom_favicon/pandora.ico
new file mode 100644
index 0000000000000000000000000000000000000000..f72d6cee90fb3d863a4917eadec20c668e665d7d
GIT binary patch
literal 1150
zcmb_au}T9$5S^f4=~dR2R$}iDSf=p@tnBmyEDk$u1RJqB1RKkgDKu&!LW&b?t`Krf
zKpRg|Xux89Z?kiZ8!sZbVY0I`^WMDKTagxiNh0`PmhE|wB@tPHA%w^zj!gu)-_~k(
zKY^vN0n8bz;AgP4CJyFcth2bE{N0%24_M{<#sPf3etGC<+JCEm=FZD|*MBYj&a>vi
z?q`AD=K195#_c_JJO_7MPu_!~>pH^+%aL&oU^C)}@0IUmH85_C9OMqMD&TuO>#}_<
zmOgWwN8=WM^-_2W>S)rilV3FAi77_Uo+FyG?#DduDe8Zu=a@rvY}_7u?nv7p=;yns
zIf>znT&$;N-Wk8;=G|#s2TV#l7yMd-auK8Rj6Od+r_s)LnoQ6h&v&0I*6!59dpEs_
z^>0V<K?6CabXYF<>@kIncz7S==^4x5w{6{j_-_j$<($ZM3kJe;hB41N){hrOoD=y1
DEgc48

literal 0
HcmV?d00001

diff --git a/pandora_console/images/custom_logo/pandora_logo_head_white_bg.png b/pandora_console/images/custom_logo/pandora_logo_head_white_bg.png
new file mode 100755
index 0000000000000000000000000000000000000000..56d101e463aed0fa44b057267438e4c4c9658571
GIT binary patch
literal 4341
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

literal 0
HcmV?d00001

diff --git a/pandora_console/images/custom_logo/pandora_logo_head_white_bg_2.png b/pandora_console/images/custom_logo/pandora_logo_head_white_bg_2.png
new file mode 100644
index 0000000000000000000000000000000000000000..9591e2fab119835e744b707d564d5617e1213e2d
GIT binary patch
literal 4198
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

literal 0
HcmV?d00001

diff --git a/pandora_console/include/functions_config.php b/pandora_console/include/functions_config.php
index 472744c66c..395d83731c 100644
--- a/pandora_console/include/functions_config.php
+++ b/pandora_console/include/functions_config.php
@@ -500,8 +500,12 @@ function config_update_config () {
 					if (!config_update_value ('flash_charts', (bool) get_parameter ('flash_charts')))
 						$error_update[] = __('Interactive charts');
 					
+					if (!config_update_value ('custom_favicon', (string) get_parameter ('custom_favicon')))
+						$error_update[] = __('Custom favicon');
 					if (!config_update_value ('custom_logo', (string) get_parameter ('custom_logo')))
 						$error_update[] = __('Custom logo');
+					if (!config_update_value ('custom_logo_white_bg', (string) get_parameter ('custom_logo_white_bg')))
+						$error_update[] = __('Custom logo white background');
 					if (!config_update_value ('custom_logo_login', (string) get_parameter ('custom_logo_login')))
 						$error_update[] = __('Custom logo login');
 					if (!config_update_value ('custom_splash_login', (string) get_parameter ('custom_splash_login')))
@@ -509,9 +513,11 @@ function config_update_config () {
 					if (!config_update_value ('custom_docs_logo', (string) get_parameter ('custom_docs_logo')))
 						$error_update[] = __('Custom documentation logo');
 					if (!config_update_value ('custom_support_logo', (string) get_parameter ('custom_support_logo')))
-						$error_update[] = __('Custom networkmap center logo');
-					if (!config_update_value ('custom_network_center_logo', (string) get_parameter ('custom_network_center_logo')))
 						$error_update[] = __('Custom support logo');
+					if (!config_update_value ('custom_network_center_logo', (string) get_parameter ('custom_network_center_logo')))
+						$error_update[] = __('Custom networkmap center logo');
+					if (!config_update_value ('custom_mobile_console_logo', (string) get_parameter ('custom_mobile_console_logo')))
+						$error_update[] = __('Custom networkmap center logo');
 					if (!config_update_value ('custom_title1_login', (string) get_parameter ('custom_title1_login')))
 						$error_update[] = __('Custom title1 login');
 					if (!config_update_value ('custom_title2_login', (string) get_parameter ('custom_title2_login')))
@@ -1189,11 +1195,19 @@ function config_process_config () {
 	if (!isset ($config["fixed_menu"])) {
 		config_update_value ('fixed_menu', false);
 	}
-	
+
+	if (!isset ($config["custom_favicon"])) {
+		config_update_value ('custom_favicon', '');
+	}
+
 	if (!isset ($config["custom_logo"])) {
 		config_update_value ('custom_logo', 'pandora_logo_head_4.png');
 	}
 
+	if (!isset ($config["custom_logo_white_bg"])) {
+		config_update_value ('custom_logo_white_bg', 'pandora_logo_head_white_bg.png');
+	}
+
 	if (!isset ($config["custom_logo_login"])) {
 		config_update_value ('custom_logo_login', 'login_logo_v7.png');
 	}
@@ -1214,6 +1228,10 @@ function config_process_config () {
 		config_update_value ('custom_network_center_logo', '');
 	}
 
+	if (!isset ($config["custom_mobile_console_logo"])) {
+		config_update_value ('custom_mobile_console_logo', '');
+	}
+
 	if (!isset ($config["custom_title1_login"])) {
 		config_update_value ('custom_title1_login', __('WELCOME TO PANDORA FMS'));
 	}
diff --git a/pandora_console/include/functions_ui.php b/pandora_console/include/functions_ui.php
index 5343fd7e23..42d839b81e 100755
--- a/pandora_console/include/functions_ui.php
+++ b/pandora_console/include/functions_ui.php
@@ -1355,14 +1355,9 @@ function ui_process_page_head ($string, $bitfield) {
 		<meta name="author" content="' . get_copyright_notice() . '" />
 		<meta name="copyright" content="(c) ' . get_copyright_notice() . '" />
 		<meta name="robots" content="index, follow" />';
-		if(defined ('METACONSOLE')){
-		$output .='<link rel="icon" href="images/favicon_meta.ico" type="image/ico" />';
-		}
-		else{
-		$output .='<link rel="icon" href="images/pandora.ico" type="image/ico" />';	
-		}
+		$output .='<link rel="icon" href="' . ui_get_favicon() . '" type="image/ico" />';
 		$output .='	
-		<link rel="shortcut icon" href="images/pandora.ico" type="image/x-icon" />
+		<link rel="shortcut icon" href="' . ui_get_favicon() . '" type="image/x-icon" />
 		<link rel="alternate" href="operation/events/events_rss.php" title="Pandora RSS Feed" type="application/rss+xml" />';
 	
 	if ($config["language"] != "en") {
@@ -3960,14 +3955,16 @@ function ui_get_support_logo () {
  * @return string with the path to logo. If it is not set, return the default value
  *
  */
-function ui_get_custom_header_logo () {
+function ui_get_custom_header_logo ($white_bg = false) {
 	global $config;
 
 	if (empty($config['enterprise_installed'])) {
 		return 'images/pandora_tinylogo_open.png';
 	}
 
-	$stored_logo = is_metaconsole() ? $config['meta_custom_logo'] : $config['custom_logo'];
+	$stored_logo = is_metaconsole()
+		? $config['meta_custom_logo']
+		: $white_bg ? $config['custom_logo_white_bg'] : $config['custom_logo'];
 	if (empty($stored_logo)) return 'images/pandora_tinylogo.png';
 	return 'enterprise/images/custom_logo/' . $stored_logo;
 }
@@ -3987,4 +3984,41 @@ function ui_get_logo_to_center_networkmap () {
 
 	return 'enterprise/images/custom_general_logos/' . $config['custom_support_logo'];
 }
+
+/**
+ * Get the mobile console login logo
+ *
+ * @return string with the path to logo. If it is not set, return the default.
+ *
+ */
+function ui_get_mobile_login_icon () {
+	global $config;
+
+	if ((!enterprise_installed()) || empty($config['custom_mobile_console_logo'])) {
+		return is_metaconsole()
+			? "mobile/images/metaconsole_mobile.png"
+			: "mobile/images/pandora_mobile_console.png";
+	}
+
+	return 'enterprise/images/custom_general_logos/' . $config['custom_mobile_console_logo'];
+}
+
+/**
+ * Get the favicon
+ *
+ * @return string with the path to logo. If it is not set, return the default.
+ *
+ */
+function ui_get_favicon () {
+	global $config;
+
+	if (empty($config['custom_favicon'])) {
+		return !is_metaconsole()
+			? "images/pandora.ico"
+			: "enterprise/meta/images/favicon_meta.ico";
+	}
+
+	return 'images/custom_favicon/' . $config['custom_favicon'];
+}
+
 ?>
diff --git a/pandora_console/mobile/include/user.class.php b/pandora_console/mobile/include/user.class.php
index ba16b537cf..82f10fd38e 100644
--- a/pandora_console/mobile/include/user.class.php
+++ b/pandora_console/mobile/include/user.class.php
@@ -226,11 +226,11 @@ class User {
 		$ui->showFooter(false);
 		$ui->beginContent();
 		
-		if (!$system->getConfig('metaconsole'))
-			$logo_image = html_print_image ("mobile/images/pandora_mobile_console.png",
+		if ($system->getConfig('metaconsole'))
+			$logo_image = html_print_image (ui_get_mobile_login_icon(),
 						true, array ("alt" => "logo", "border" => 0));
 		else
-			$logo_image = html_print_image ("mobile/images/metaconsole_mobile.png",
+			$logo_image = html_print_image (ui_get_mobile_login_icon(),
 						true, array ("alt" => "logo", "border" => 0),false, false, false, true);
 		
 		$ui->contentAddHtml('<div style="text-align: center;" class="login_logo">' .
@@ -289,7 +289,7 @@ class User {
 		$ui->showFooter(false);
 		$ui->beginContent();
 			$ui->contentAddHtml('<div style="text-align: center;" class="login_logo">' .
-				html_print_image ("mobile/images/pandora_mobile_console.png",
+				html_print_image (ui_get_mobile_login_icon(),
 					true, array ("alt" => "logo", "border" => 0)) .
 					'</div>');
 			$ui->contentAddHtml('<div id="login_container">');
diff --git a/pandora_console/operation/events/events_marquee.php b/pandora_console/operation/events/events_marquee.php
index 9ffea8f61d..e3b04e39da 100644
--- a/pandora_console/operation/events/events_marquee.php
+++ b/pandora_console/operation/events/events_marquee.php
@@ -110,7 +110,7 @@ echo "<title>" . __("%s - Latest events", get_product_name()) . "</title>";
 
 $query = ui_get_full_url();
 echo '<meta http-equiv="refresh" content="' . $MARQUEE_INTERVAL . '; URL=' . $query . '">';
-echo '<link rel="icon" href="../../images/pandora.ico" type="image/ico">';
+echo '<link rel="icon" href="../../' . ui_get_favicon() . '" type="image/ico">';
 echo "</head>";
 
 echo "<body bgcolor='#000000' >";
diff --git a/pandora_console/operation/events/sound_events.php b/pandora_console/operation/events/sound_events.php
index f9a89364a1..d8e3ce8cd3 100644
--- a/pandora_console/operation/events/sound_events.php
+++ b/pandora_console/operation/events/sound_events.php
@@ -61,7 +61,7 @@ echo "<title>" . __("Sound Events") . "</title>";
 	}
 </style>
 <?php
-echo '<link rel="icon" href="../../images/pandora.ico" type="image/ico" />';
+echo '<link rel="icon" href="../../' . ui_get_favicon() . '" type="image/ico" />';
 echo '<link rel="stylesheet" href="../../include/styles/pandora.css" type="text/css" />';
 echo "</head>";
 echo "<body style='background-color: #494949; max-width: 550px; max-height: 400px; margin-top:40px;'>";
diff --git a/pandora_console/pandoradb_data.sql b/pandora_console/pandoradb_data.sql
index 069d82186b..c8ed8f61cd 100644
--- a/pandora_console/pandoradb_data.sql
+++ b/pandora_console/pandoradb_data.sql
@@ -115,7 +115,8 @@ INSERT INTO `tconfig` (`token`, `value`) VALUES
 ('current_package_enterprise', '722'),
 ('post_process_custom_values', '{"0.00000038580247":"Seconds&#x20;to&#x20;months","0.00000165343915":"Seconds&#x20;to&#x20;weeks","0.00001157407407":"Seconds&#x20;to&#x20;days","0.01666666666667":"Seconds&#x20;to&#x20;minutes","0.00000000093132":"Bytes&#x20;to&#x20;Gigabytes","0.00000095367432":"Bytes&#x20;to&#x20;Megabytes","0.0009765625":"Bytes&#x20;to&#x20;Kilobytes","0.00000001653439":"Timeticks&#x20;to&#x20;weeks","0.00000011574074":"Timeticks&#x20;to&#x20;days"}'),
 ('custom_docs_logo', 'default_docs.png'),
-('custom_support_logo', 'default_support.png');
+('custom_support_logo', 'default_support.png'),
+('custom_logo_white_bg_preview', 'pandora_logo_head_white_bg.png');
 UNLOCK TABLES;
 
 --