diff --git a/themes/enhanced/app_defaults.php b/themes/enhanced/app_defaults.php
index 5821812682..93c063b191 100644
--- a/themes/enhanced/app_defaults.php
+++ b/themes/enhanced/app_defaults.php
@@ -60,14 +60,14 @@ if ($domains_processed == 1) {
 		$array[$x]['default_setting_subcategory'] = 'domain_background_color';
 		$array[$x]['default_setting_name'] = 'text';
 		$array[$x]['default_setting_value'] = '#000000';
-		$array[$x]['default_setting_enabled'] = 'true';
+		$array[$x]['default_setting_enabled'] = 'false';
 		$array[$x]['default_setting_description'] = 'Set the background color (hexidecimal) for the domain name.';
 		$x++;
 		$array[$x]['default_setting_category'] = 'theme';
 		$array[$x]['default_setting_subcategory'] = 'domain_background_opacity';
 		$array[$x]['default_setting_name'] = 'text';
 		$array[$x]['default_setting_value'] = '0.1';
-		$array[$x]['default_setting_enabled'] = 'true';
+		$array[$x]['default_setting_enabled'] = 'false';
 		$array[$x]['default_setting_description'] = 'Set the background opacity of the domain name.';
 		$x++;
 		$array[$x]['default_setting_category'] = 'theme';
diff --git a/themes/enhanced/template.php b/themes/enhanced/template.php
index 1a03836e0a..1f2894175e 100644
--- a/themes/enhanced/template.php
+++ b/themes/enhanced/template.php
@@ -866,13 +866,13 @@ legend {
 		display: <?php echo ($_SESSION['theme']['domain_visible']['text'] != 'true') ? 'none' : 'inline-block'; ?>;
 		white-space: nowrap;
 		margin-top: 10px;
-		padding: 3px 7px 1px 7px;
+		padding: 2px <?php echo ($_SESSION['theme']['domain_background_opacity']['text'] != '' && $_SESSION['theme']['domain_background_opacity']['text'] != 0) ? 7 : 0; ?>px 1px 7px;
 		margin-top: -1px;
-		background-color: rgba(<?php echo hex2rgb($_SESSION['theme']['domain_background_color']['text'],','); ?>, <?php echo $_SESSION['theme']['domain_background_opacity']['text']; ?>);
+		background-color: rgba(<?php echo hex2rgb($_SESSION['theme']['domain_background_color']['text'],','); ?>, <?php echo ($_SESSION['theme']['domain_background_opacity']['text'] != '') ? $_SESSION['theme']['domain_background_opacity']['text'] : 0; ?>);
 		-webkit-border-radius: 1px;
 		-moz-border-radius: 1px;
 		border-radius: 1px;
-		font-size: 10px;
+		font-size: 12px;
 		color: <?php echo $_SESSION['theme']['domain_color']['text']; ?>;
 	}
 
@@ -1292,7 +1292,7 @@ if (strlen($_SESSION['message']) > 0) {
 
 								//domain selector icon
 									if ($_SESSION["username"] != '' && permission_exists("domain_select") && count($_SESSION['domains']) > 1) {
-										echo "&nbsp;<span id='domain_selector_domain'>".$_SESSION['domain_name']."</span><img id='domain_selector_icon' src='".PROJECT_PATH."/themes/enhanced/images/icon_domain_selector.png' style='width: 28px; height: 23px; border: none;' title='".$_SESSION['domain_name']." &#10;".$text['theme-label-open_selector']."' align='absmiddle'>";
+										echo "<span id='domain_selector_domain'>".$_SESSION['domain_name']."</span><img id='domain_selector_icon' src='".PROJECT_PATH."/themes/enhanced/images/icon_domain_selector.png' style='width: 28px; height: 23px; border: none;' title='".$_SESSION['domain_name']." &#10;".$text['theme-label-open_selector']."' align='absmiddle'>";
 									}
 
 								//logout icon