diff --git a/themes/enhanced/template.php b/themes/enhanced/template.php
index d923aae385..3b5579bcb9 100644
--- a/themes/enhanced/template.php
+++ b/themes/enhanced/template.php
@@ -1570,7 +1570,7 @@ if (strlen($_SESSION['message']) > 0) {
 									}
 
 								//logout icon
-									if ($_SESSION['username'] != '' && $_SESSION['theme']['logout_icon_visible'] == "true") {
+									if ($_SESSION['username'] != '' && $_SESSION['theme']['logout_icon_visible']['text'] == "true") {
 										$username_full = $_SESSION['username'].((count($_SESSION['domains']) > 1) ? "@".$_SESSION["user_context"] : null);
 										echo "<a href='".PROJECT_PATH."/logout.php' onclick=\"return confirm('".$text['theme-confirm-logout']."');\"><img id='logout_icon' src='".PROJECT_PATH."/themes/enhanced/images/icon_logout.png' style='width: 28px; height: 23px; border: none;' title='".$text['theme-label-logout']." ".$username_full."' align='absmiddle'></a>";
 										unset($username_full);
diff --git a/themes/minimized/template.php b/themes/minimized/template.php
index 6af07a2011..1fa791cb71 100644
--- a/themes/minimized/template.php
+++ b/themes/minimized/template.php
@@ -1411,7 +1411,7 @@ SPAN.playback_progress_bar {
 						}
 
 						//logout icon
-						if ($_SESSION['username'] != '') {
+						if ($_SESSION['username'] != '' && $_SESSION['theme']['logout_icon_visible']['text'] == "true") {
 							$username_full = $_SESSION['username'].((count($_SESSION['domains']) > 1) ? "@".$_SESSION["user_context"] : null);
 							echo "<a href='".PROJECT_PATH."/logout.php' onclick=\"return confirm('".$text['theme-confirm-logout']."');\"><img id='logout_icon' src='".PROJECT_PATH."/themes/minimized/images/icon_logout.png' style='width: 28px; height: 23px; border: none;' title='".$text['theme-label-logout']." ".$username_full."' align='absmiddle'></a>";
 							unset($username_full);
@@ -1433,7 +1433,15 @@ SPAN.playback_progress_bar {
 			<div id="domains_block">
 				<div id="domains_header">
 					<input id="domains_hide" type="button" class="btn" style="float: right" value="<?php echo $text['theme-button-close']; ?>">
-					<b style="color: #000;"><?php echo $text['theme-title-domains']; ?></b> (<?php echo sizeof($_SESSION['domains']); ?>)
+					<?php
+					if (file_exists($_SERVER["DOCUMENT_ROOT"]."/app/domains/domains.php")) {
+						$href = '/app/domains/domains.php';
+					}
+					else {
+						$href = '/core/domain_settings/domains.php';
+					}
+					echo "<a href=\"".$href."\"><b style=\"color: #000;\">".$text['theme-title-domains']."</b></a> (".sizeof($_SESSION['domains']).")";
+					?>
 					<br><br>
 					<input type="text" id="domain_filter" class="formfld" style="min-width: 100%; width: 100%;" placeholder="<?php echo $text['theme-label-search']; ?>" onkeyup="domain_search(this.value);">
 				</div>