diff --git a/app/devices/app_languages.php b/app/devices/app_languages.php
index 0637cbd332..f1eca2eb45 100644
--- a/app/devices/app_languages.php
+++ b/app/devices/app_languages.php
@@ -975,11 +975,6 @@
 		$text['button-show_all']['pt-pt'] = "Mostrar Todos";
 		$text['button-show_all']['fr-fr'] = "Montrer Tout";
 
-		$text['label-domain-name']['en-us'] = "Domain Name";
-		$text['label-domain-name']['es-cl'] = "Nombre de Dominio";
-		$text['label-domain-name']['pt-pt'] = "Nome de Domínio";
-		$text['label-domain-name']['fr-fr'] = "Nom de Domaine";
-
 		$text['message-maximum_devices']['en-us'] = "Maximum Devices:";
 		$text['message-maximum_devices']['es-cl'] = "Dispositivos Máximo Permitido:";
 		$text['message-maximum_devices']['pt-pt'] = "Dispositivos Máximo Permitido:";
diff --git a/app/devices/devices.php b/app/devices/devices.php
index 667acd96e4..3a1104c038 100644
--- a/app/devices/devices.php
+++ b/app/devices/devices.php
@@ -59,9 +59,11 @@ else {
 	echo "		<td align='right' nowrap='nowrap' valign='top'>\n";
 	echo "			<form method='get' action=''>\n";
 	if (permission_exists('device_all')) {
-		echo "			<input type='button' class='btn' value='".$text['button-show_all']."' onclick=\"window.location='devices.php?showall=true';\">\n";
 		if ($_GET['showall'] == 'true') {
-			echo "			<input type='hidden' name='showall' value='true'>";
+			echo "	<input type='hidden' name='showall' value='true'>";
+		}
+		else {
+			echo "	<input type='button' class='btn' value='".$text['button-show_all']."' onclick=\"window.location='devices.php?showall=true';\">\n";
 		}
 	}
 	if (permission_exists('device_profile_view')) {
@@ -179,7 +181,7 @@ else {
 	echo "<table class='tr_hover' width='100%' border='0' cellpadding='0' cellspacing='0'>\n";
 	echo "<tr>\n";
 	if ($_GET['showall'] && permission_exists('device_all')) {
-		echo th_order_by('domain_name', $text['label-domain-name'], $order_by, $order, $param);
+		echo th_order_by('domain_name', $text['label-domain'], $order_by, $order, $param);
 	}
 	echo th_order_by('device_mac_address', $text['label-device_mac_address'], $order_by, $order);
 	echo th_order_by('device_label', $text['label-device_label'], $order_by, $order);
diff --git a/app/xml_cdr/app_languages.php b/app/xml_cdr/app_languages.php
index c6eda215b0..a283b7e0f3 100644
--- a/app/xml_cdr/app_languages.php
+++ b/app/xml_cdr/app_languages.php
@@ -613,8 +613,8 @@
 	$text['button-show_all']['pt-pt'] = "Mostrar Todos";
 	$text['button-show_all']['fr-fr'] = "Montrer Tout";
 
-	$text['label-domain-name']['en-us'] = "Domain Name";
-	$text['label-domain-name']['es-cl'] = "Nombre de Dominio";
-	$text['label-domain-name']['pt-pt'] = "Nome de Domínio";
-	$text['label-domain-name']['fr-fr'] = "Nom de Domaine";
+	$text['label-domain']['en-us'] = "Domain";
+	$text['label-domain']['es-cl'] = "Dominio";
+	$text['label-domain']['pt-pt'] = "Domínio";
+	$text['label-domain']['fr-fr'] = "Domaine";
 ?>
\ No newline at end of file
diff --git a/app/xml_cdr/xml_cdr.php b/app/xml_cdr/xml_cdr.php
index f9869e7cd6..948ae55781 100644
--- a/app/xml_cdr/xml_cdr.php
+++ b/app/xml_cdr/xml_cdr.php
@@ -113,7 +113,9 @@ else {
 	echo "		<tr>\n";
 	echo "			<td style='vertical-align: top;'>\n";
 	if (permission_exists('xml_cdr_all')) {
-		echo "			<input type='button' class='btn' value='".$text['button-show_all']."' onclick=\"window.location='xml_cdr.php?showall=true';\">\n";
+		if ($_GET['showall'] != 'true') {
+			echo "		<input type='button' class='btn' value='".$text['button-show_all']."' onclick=\"window.location='xml_cdr.php?showall=true';\">\n";
+		}
 	}
 	if (permission_exists('xml_cdr_search_advanced')) {
 		echo "			<input type='button' class='btn' value='".$text['button-advanced_search']."' onclick=\"window.location='xml_cdr_search.php';\">\n";
@@ -317,7 +319,7 @@ else {
 	}
 	echo "<th>&nbsp;</th>\n";
 	if ($_GET['showall'] && permission_exists('xml_cdr_all')) {
-		echo th_order_by('domain_name', $text['label-domain-name'], $order_by, $order, null, null, $param);
+		echo th_order_by('domain_name', $text['label-domain'], $order_by, $order, null, null, $param);
 	}
 	echo th_order_by('caller_id_name', $text['label-cid-name'], $order_by, $order, null, null, $param);
 	echo th_order_by('caller_id_number', $text['label-source'], $order_by, $order, null, null, $param);
diff --git a/app/xml_cdr/xml_cdr_statistics.php b/app/xml_cdr/xml_cdr_statistics.php
index cd2f9ad1e4..c274f921ab 100644
--- a/app/xml_cdr/xml_cdr_statistics.php
+++ b/app/xml_cdr/xml_cdr_statistics.php
@@ -48,7 +48,9 @@ else {
 	echo "	<td width='30%' align='left' valign='top' nowrap='nowrap'><b>".$text['label-call-statistics']."</b></td>\n";
 	echo "	<td width='70%' align='right' valign='top'>\n";
 	if (permission_exists('xml_cdr_all')) {
-		echo "			<input type='button' class='btn' value='".$text['button-show_all']."' onclick=\"window.location='xml_cdr_statistics.php?showall=true';\">\n";
+		if ($_GET['showall'] != 'true') {
+			echo "<input type='button' class='btn' value='".$text['button-show_all']."' onclick=\"window.location='xml_cdr_statistics.php?showall=true';\">\n";
+		}
 	}
 	echo "		<input type='button' class='btn' name='' alt='".$text['button-back']."' onclick=\"window.location='xml_cdr.php'\" value='".$text['button-back']."'>\n";
 	echo "		<input type='button' class='btn' value='".$text['button-extension_summary']."' onclick=\"document.location.href='xml_cdr_extension_summary.php';\">\n";