diff --git a/app/extensions/app_languages.php b/app/extensions/app_languages.php
index 09da6428c7..9127337397 100644
--- a/app/extensions/app_languages.php
+++ b/app/extensions/app_languages.php
@@ -377,11 +377,6 @@
 	$text['description-user_context']['pt-pt'] = "Introduza o contexto do utilizador aqui.";
 	$text['description-user_context']['fr-fr'] = "Insérer le contexte utilisateur. Surpasse le contexte du domaine. ";
 
-	$text['label-show_advanced']['en-us'] = "Show Advanced";
-	$text['label-show_advanced']['es-cl'] = "Mostrar Avanzados";
-	$text['label-show_advanced']['pt-pt'] = "Mostrar Opções Avançadas";
-	$text['label-show_advanced']['fr-fr'] = "Paramètres Avancés";
-
 	$text['button-advanced']['en-us'] = "Advanced";
 	$text['button-advanced']['es-cl'] = "Avanzado";
 	$text['button-advanced']['pt-pt'] = "Avançadas";
diff --git a/app/extensions/extension_edit.php b/app/extensions/extension_edit.php
index 7ef26e6804..1b8788c33b 100644
--- a/app/extensions/extension_edit.php
+++ b/app/extensions/extension_edit.php
@@ -754,20 +754,8 @@ if (count($_POST) > 0 && strlen($_POST["persistformvar"]) == 0) {
 	echo "}\n";
 	echo "\n";
 	echo "function show_advanced_config() {\n";
-	echo "	document.getElementById(\"show_advanced_box\").innerHTML='';\n";
-	echo "	document.getElementById('auth_acl').style.display = \"table-row\";\n";
-	echo "	document.getElementById('cidr').style.display = \"table-row\";\n";
-	echo "	document.getElementById('sip_force_contact').style.display = \"table-row\";\n";
-	echo "	document.getElementById('sip_force_expires').style.display = \"table-row\";\n";
-	echo "	document.getElementById('nibble_account').style.display = \"table-row\";\n";
-	echo "	document.getElementById('mwi_account').style.display = \"table-row\";\n";
-	echo "	document.getElementById('sip_bypass_media').style.display = \"table-row\";\n";
-	echo "	document.getElementById('dial_string').style.display = \"table-row\";\n";
-	echo "}\n";
-	echo "\n";
-	echo "function hide_advanced_config() {\n";
-	echo "	document.getElementById(\"show_advanced_box\").innerHTML='';\n";
-	echo "	document.getElementById('show_advanced').style.display = \"none\";\n";
+	echo "	$('#show_advanced_box').slideToggle();\n";
+	echo "	$('#show_advanced').slideToggle();\n";
 	echo "}\n";
 	echo "\n";
 	echo "function copy_extension() {\n";
@@ -1593,26 +1581,35 @@ if (count($_POST) > 0 && strlen($_POST["persistformvar"]) == 0) {
 
 	//--- begin: show_advanced -----------------------
 
+	echo "<tr>\n";
+	echo "<td style='padding: 0px;' colspan='2' class='' valign='top' align='left' nowrap>\n";
 
-	echo "<tr id=\"show_advanced_box\">\n";
-	echo "	<td valign=\"top\" class=\"vncell\">".$text['label-show_advanced']."</td>\n";
-	echo "	<td class=\"vtable\">\n";
-	echo "		<input type=\"button\" class=\"btn\" onClick=\"show_advanced_config()\" value=\"".$text['button-advanced']."\"></input>\n";
-	echo "	</td>\n";
-	echo "</tr>\n";
+	echo "	<div id=\"show_advanced_box\">\n";
+	echo "		<table width=\"100%\" border=\"0\" cellpadding=\"6\" cellspacing=\"0\">\n";
+	echo "		<tr>\n";
+	echo "		<td width=\"30%\" valign=\"top\" class=\"vncell\">&nbsp;</td>\n";
+	echo "		<td width=\"70%\" class=\"vtable\">\n";
+	echo "			<input type=\"button\" class=\"btn\" onClick=\"show_advanced_config()\" value=\"".$text['button-advanced']."\"></input>\n";
+	echo "		</td>\n";
+	echo "		</tr>\n";
+	echo "		</table>\n";
+	echo "	</div>\n";
 
-	echo "<tr id=\"auth_acl\" style=\"display:none\">\n";
-	echo "<td class='vncell' valign='top' align='left' nowrap='nowrap'>\n";
+	echo "	<div id=\"show_advanced\" style=\"display:none\">\n";
+	echo "	<table width=\"100%\" border=\"0\" cellpadding=\"6\" cellspacing=\"0\">\n";
+
+	echo "<tr>\n";
+	echo "<td width=\"30%\" class='vncell' valign='top' align='left' nowrap='nowrap'>\n";
 	echo "    ".$text['label-auth_acl'].":\n";
 	echo "</td>\n";
-	echo "<td class='vtable' align='left'>\n";
+	echo "<td width=\"70%\" class='vtable' align='left'>\n";
 	echo "   <input class='formfld' type='text' name='auth_acl' maxlength='255' value=\"$auth_acl\">\n";
 	echo "   <br />\n";
 	echo $text['description-auth_acl']."\n";
 	echo "</td>\n";
 	echo "</tr>\n";
 
-	echo "<tr id=\"cidr\" style=\"display:none\">\n";
+	echo "<tr>\n";
 	echo "<td class='vncell' valign='top' align='left' nowrap='nowrap'>\n";
 	echo "    ".$text['label-cidr'].":\n";
 	echo "</td>\n";
@@ -1623,7 +1620,7 @@ if (count($_POST) > 0 && strlen($_POST["persistformvar"]) == 0) {
 	echo "</td>\n";
 	echo "</tr>\n";
 
-	echo "<tr id=\"sip_force_contact\" style=\"display:none\">\n";
+	echo "<tr>\n";
 	echo "<td class='vncell' valign='top' align='left' nowrap='nowrap'>\n";
 	echo "    ".$text['label-sip_force_contact'].":\n";
 	echo "</td>\n";
@@ -1645,7 +1642,7 @@ if (count($_POST) > 0 && strlen($_POST["persistformvar"]) == 0) {
 	echo "</td>\n";
 	echo "</tr>\n";
 
-	echo "<tr id=\"sip_force_expires\" style=\"display:none\">\n";
+	echo "<tr>\n";
 	echo "<td class='vncell' valign='top' align='left' nowrap='nowrap'>\n";
 	echo "    ".$text['label-sip_force_expires'].":\n";
 	echo "</td>\n";
@@ -1656,7 +1653,7 @@ if (count($_POST) > 0 && strlen($_POST["persistformvar"]) == 0) {
 	echo "</td>\n";
 	echo "</tr>\n";
 
-	echo "<tr id=\"nibble_account\" style=\"display:none\">\n";
+	echo "<tr>\n";
 	echo "<td class='vncell' valign='top' align='left' nowrap='nowrap'>\n";
 	echo "    ".$text['label-nibble_account'].":\n";
 	echo "</td>\n";
@@ -1667,7 +1664,7 @@ if (count($_POST) > 0 && strlen($_POST["persistformvar"]) == 0) {
 	echo "</td>\n";
 	echo "</tr>\n";
 
-	echo "<tr id=\"mwi_account\" style=\"display:none\">\n";
+	echo "<tr>\n";
 	echo "<td class='vncell' valign='top' align='left' nowrap='nowrap'>\n";
 	echo "    ".$text['label-mwi_account'].":\n";
 	echo "</td>\n";
@@ -1678,7 +1675,7 @@ if (count($_POST) > 0 && strlen($_POST["persistformvar"]) == 0) {
 	echo "</td>\n";
 	echo "</tr>\n";
 
-	echo "<tr id=\"sip_bypass_media\" style=\"display:none\">\n";
+	echo "<tr>\n";
 	echo "<td class='vncell' valign='top' align='left' nowrap='nowrap'>\n";
 	echo "    ".$text['label-sip_bypass_media'].":\n";
 	echo "</td>\n";
@@ -1700,7 +1697,7 @@ if (count($_POST) > 0 && strlen($_POST["persistformvar"]) == 0) {
 	echo "</td>\n";
 	echo "</tr>\n";
 
-	echo "<tr id=\"dial_string\" style=\"display:none\">\n";
+	echo "<tr>\n";
 	echo "<td class='vncell' valign='top' align='left' nowrap='nowrap'>\n";
 	echo "    ".$text['label-dial_string'].":\n";
 	echo "</td>\n";
@@ -1711,6 +1708,12 @@ if (count($_POST) > 0 && strlen($_POST["persistformvar"]) == 0) {
 	echo "</td>\n";
 	echo "</tr>\n";
 
+	echo "	</table>\n";
+	echo "	</div>";
+
+	echo "</td>\n";
+	echo "</tr>\n";
+
 	//--- end: show_advanced -----------------------
 
 	if (permission_exists('extension_enabled')) {
diff --git a/app/gateways/app_languages.php b/app/gateways/app_languages.php
index dbf3ffb343..588aad270a 100644
--- a/app/gateways/app_languages.php
+++ b/app/gateways/app_languages.php
@@ -377,11 +377,6 @@
 	$text['button-advanced']['pt-pt'] = "Avançadas";
 	$text['button-advanced']['fr-fr'] = "Afficher les Paramètres Avancés";
 
-	$text['button-advanced-show']['en-us'] = "Show Advanced";
-	$text['button-advanced-show']['es-cl'] = "Mostrar Avanzado";
-	$text['button-advanced-show']['pt-pt'] = "Mostrar Avançadas";
-	$text['button-advanced-show']['fr-fr'] = "Paramètres Avancés";
-
 	$text['confirm-delete']['en-us'] = "Do you really want to delete this?";
 	$text['confirm-delete']['es-cl'] = "¿Realmente desea eliminar esto?";
 	$text['confirm-delete']['pt-pt'] = "Deseja realmente remover isto?";
diff --git a/app/gateways/gateway_edit.php b/app/gateways/gateway_edit.php
index 79283e0cad..042453a6da 100644
--- a/app/gateways/gateway_edit.php
+++ b/app/gateways/gateway_edit.php
@@ -344,15 +344,8 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
 	echo "}\n";
 	echo "\n";
 	echo "function show_advanced_config() {\n";
-	echo "	document.getElementById(\"show_advanced_box\").innerHTML='';\n";
-	echo "	aodiv = document.getElementById('show_advanced');\n";
-	echo "	aodiv.style.display = \"block\";\n";
-	echo "}\n";
-	echo "\n";
-	echo "function hide_advanced_config() {\n";
-	echo "	document.getElementById(\"show_advanced_box\").innerHTML='';\n";
-	echo "	aodiv = document.getElementById('show_advanced');\n";
-	echo "	aodiv.style.display = \"block\";\n";
+	echo "	$('#show_advanced_box').slideToggle();\n";
+	echo "	$('#show_advanced').slideToggle();\n";
 	echo "}\n";
 	echo "</script>";
 
@@ -523,7 +516,7 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
 	echo "	<div id=\"show_advanced_box\">\n";
 	echo "		<table width=\"100%\" border=\"0\" cellpadding=\"6\" cellspacing=\"0\">\n";
 	echo "		<tr>\n";
-	echo "		<td width=\"30%\" valign=\"top\" class=\"vncell\">".$text['button-advanced-show']."</td>\n";
+	echo "		<td width=\"30%\" valign=\"top\" class=\"vncell\">&nbsp;</td>\n";
 	echo "		<td width=\"70%\" class=\"vtable\">\n";
 	echo "			<input type=\"button\" class=\"btn\" onClick=\"show_advanced_config()\" value=\"".$text['button-advanced']."\"></input>\n";
 	echo "		</td>\n";
diff --git a/app/ivr_menu/app_languages.php b/app/ivr_menu/app_languages.php
index bb49931b82..8ef82f26a8 100644
--- a/app/ivr_menu/app_languages.php
+++ b/app/ivr_menu/app_languages.php
@@ -173,11 +173,6 @@
 	$text['label-description']['pt-pt'] = "Descrição";
 	$text['label-description']['fr-fr'] = "Description";
 
-	$text['label-advanced']['en-us'] = "Show Advanced";
-	$text['label-advanced']['es-cl'] = "Mostrar Avanzados";
-	$text['label-advanced']['pt-pt'] = "Opções Avançadas";
-	$text['label-advanced']['fr-fr'] = "Paramètres Avancés";
-
 	$text['label-option']['en-us'] = "Option";
 	$text['label-option']['es-cl'] = "Opción";
 	$text['label-option']['pt-pt'] = "Opção";
diff --git a/app/ivr_menu/ivr_menu_edit.php b/app/ivr_menu/ivr_menu_edit.php
index ea0cabd15b..45343a1e86 100644
--- a/app/ivr_menu/ivr_menu_edit.php
+++ b/app/ivr_menu/ivr_menu_edit.php
@@ -366,15 +366,8 @@ if (count($_POST) > 0 && strlen($_POST["persistformvar"]) == 0) {
 	echo "}\n";
 	echo "\n";
 	echo "function show_advanced_config() {\n";
-	echo "	document.getElementById(\"show_advanced_box\").innerHTML='';\n";
-	echo "	aodiv = document.getElementById('show_advanced');\n";
-	echo "	aodiv.style.display = \"block\";\n";
-	echo "}\n";
-	echo "\n";
-	echo "function hide_advanced_config() {\n";
-	echo "	document.getElementById(\"show_advanced_box\").innerHTML='';\n";
-	echo "	aodiv = document.getElementById('show_advanced');\n";
-	echo "	aodiv.style.display = \"block\";\n";
+	echo "	$('#show_advanced_box').slideToggle();\n";
+	echo "	$('#show_advanced').slideToggle();\n";
 	echo "}\n";
 	echo "</script>";
 
@@ -834,7 +827,7 @@ for ($c = 0; $c < 1; $c++) {
 		echo "	<div id=\"show_advanced_box\">\n";
 		echo "		<table width=\"100%\" border=\"0\" cellpadding=\"6\" cellspacing=\"0\">\n";
 		echo "		<tr>\n";
-		echo "		<td width=\"30%\" valign=\"top\" class=\"vncell\">".$text['label-advanced']."</td>\n";
+		echo "		<td width=\"30%\" valign=\"top\" class=\"vncell\">&nbsp;</td>\n";
 		echo "		<td width=\"70%\" class=\"vtable\">\n";
 		echo "			<input type=\"button\" class='btn' onClick=\"show_advanced_config()\" value=\"".$text['button-advanced']."\"></input></a>\n";
 		echo "		</td>\n";
diff --git a/app/time_conditions/app_languages.php b/app/time_conditions/app_languages.php
index 7cdd5151e7..029dd854b6 100644
--- a/app/time_conditions/app_languages.php
+++ b/app/time_conditions/app_languages.php
@@ -169,10 +169,6 @@
 	$text['description-week-of-month']['fr-fr'] = "Choisir le numéro de la semaine dans le mois";
 
 //begin: show_advanced
-	$text['label-show-advanced']['en-us'] = "Show Advanced";
-	$text['label-show-advanced']['es-cl'] = "Ver Avanzadas";
-	$text['label-show-advanced']['pt-pt'] = "Opções Avançadas";
-	$text['label-show-advanced']['fr-fr'] = "Paramètres avancés";
 
 	$text['button-advanced']['en-us'] = "Advanced";
 	$text['button-advanced']['es-cl'] = "Avanzadas";
diff --git a/app/time_conditions/time_condition_add.php b/app/time_conditions/time_condition_add.php
index df48cb8ba5..ead726e3c8 100644
--- a/app/time_conditions/time_condition_add.php
+++ b/app/time_conditions/time_condition_add.php
@@ -494,15 +494,8 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
 <!--
 
 function show_advanced_config() {
-	document.getElementById("show_advanced_box").innerHTML='';
-	aodiv = document.getElementById('show_advanced');
-	aodiv.style.display = "block";
-}
-
-function hide_advanced_config() {
-	document.getElementById("show_advanced_box").innerHTML='';
-	aodiv = document.getElementById('show_advanced');
-	aodiv.style.display = "block";
+	$('#show_advanced_box').slideToggle();
+	$('#show_advanced').slideToggle();
 }
 
 function template_onchange(tmp_object) {
@@ -897,7 +890,7 @@ echo "</tr>\n";
 	echo "	<div id=\"show_advanced_box\">\n";
 	echo "		<table width=\"100%\" border=\"0\" cellpadding=\"6\" cellspacing=\"0\">\n";
 	echo "		<tr>\n";
-	echo "		<td width=\"20%\" valign=\"top\" class=\"vncell\">".$text['label-show-advanced'].":</td>\n";
+	echo "		<td width=\"20%\" valign=\"top\" class=\"vncell\">&nbsp;</td>\n";
 	echo "		<td width=\"80%\" class=\"vtable\">\n";
 	echo "			<input type=\"button\" class='btn' onClick=\"show_advanced_config()\" value=\"".$text['button-advanced']."\"></input></a>\n";
 	echo "		</td>\n";
diff --git a/app/xmpp/app_languages.php b/app/xmpp/app_languages.php
index 71d15c80d3..15c611e042 100644
--- a/app/xmpp/app_languages.php
+++ b/app/xmpp/app_languages.php
@@ -275,11 +275,6 @@
 	$text['button-advanced']['pt-pt'] = "Avançadas";
 	$text['button-advanced']['fr-fr'] = "Afficher les paramètres avancés";
 
-	$text['label-advanced']['en-us'] = "Show Advanced";
-	$text['label-advanced']['es-cl'] = "Mostrar avanzadas";
-	$text['label-advanced']['pt-pt'] = "Opções Avançadas";
-	$text['label-advanced']['fr-fr'] = "Paramètres Avancés";
-
 	$text['confirm-delete']['en-us'] = "Do you really want to delete this?";
 	$text['confirm-delete']['es-cl'] = "¿Realmente desea eliminar esto?";
 	$text['confirm-delete']['pt-pt'] = "Tem a certeza que pretende remover isto?";
diff --git a/app/xmpp/profile_edit.php b/app/xmpp/profile_edit.php
index 35bf9e98be..9223fb742b 100644
--- a/app/xmpp/profile_edit.php
+++ b/app/xmpp/profile_edit.php
@@ -7,15 +7,8 @@ function enable_change(enable_over) {
 }
 
 function show_advanced_config() {
-  document.getElementById("show_advanced_box").innerHTML='';
-  aodiv = document.getElementById('show_advanced');
-  aodiv.style.display = "block";
-}
-
-function hide_advanced_config() {
-  document.getElementById("show_advanced_box").innerHTML='';
-  aodiv = document.getElementById('show_advanced');
-  aodiv.style.display = "block";
+	$('#show_advanced_box').slideToggle();
+	$('#show_advanced').slideToggle();
 }
 </script>
 
@@ -132,7 +125,7 @@ function hide_advanced_config() {
 		<div id="show_advanced_box">
 			<table width="100%" border="0" cellpadding="6" cellspacing="0">
 				<tr>
-					<td width="30%" valign="top" class="vncell"><?php echo $text['label-advanced']?></td>
+					<td width="30%" valign="top" class="vncell">&nbsp;</td>
 					<td width="70%" class="vtable">
 						<input type="button" class="btn" onClick="show_advanced_config()" value="<?php echo $text['button-advanced']?>"></input>
 					</td>
@@ -146,7 +139,7 @@ function hide_advanced_config() {
 					<td width='30%' class='vncellreq' valign='top' align='left' nowrap='nowrap'>
 						<?php echo $text['label-context']?>:
 					</td>
-					<td class='vtable' align='left'>
+					<td width='70%' class='vtable' align='left'>
 						<input class='formfld' type='text' name='context' maxlength='255' value="<?php echo $profile['context'];?>">
 						<br />
 						<?php echo $text['description-context']?>