diff --git a/app/operator_panel/app_languages.php b/app/operator_panel/app_languages.php
index de86341a78..ef22d0586b 100644
--- a/app/operator_panel/app_languages.php
+++ b/app/operator_panel/app_languages.php
@@ -50,4 +50,19 @@
 	$text['label-status_do_not_disturb']['pt-pt'] = "Não Perturbar";
 	$text['label-status_do_not_disturb']['fr-fr'] = "Ne pas déranger";
 
+	$text['label-eavesdrop']['en-us'] = "Eavesdrop";
+	$text['label-eavesdrop']['es-cl'] = "Escuchar";
+	$text['label-eavesdrop']['pt-pt'] = "Bisbilhotar";
+	$text['label-eavesdrop']['fr-fr'] = "Espionner";
+
+	$text['label-kill']['en-us'] = "Kill";
+	$text['label-kill']['es-cl'] = "Finalizar Llamada";
+	$text['label-kill']['pt-pt'] = "Chamada Final";
+	$text['label-kill']['fr-fr'] = "Tuer Appel";
+
+	$text['button-all']['en-us'] = "All";
+	$text['button-all']['es-cl'] = "Todos";
+	$text['button-all']['pt-pt'] = "Tudo";
+	$text['button-all']['fr-fr'] = "Tous";
+
 ?>
\ No newline at end of file
diff --git a/app/operator_panel/index.php b/app/operator_panel/index.php
index 8f2e700ddd..ead8a4f1a5 100644
--- a/app/operator_panel/index.php
+++ b/app/operator_panel/index.php
@@ -93,7 +93,7 @@ require_once "resources/header.php";
 		var url = source_url;
 		url += '&vd_ext_from=' + document.getElementById('vd_ext_from').value;
 		url += '&vd_ext_to=' + document.getElementById('vd_ext_to').value;
-		url += '&group=' + ((document.getElementById('group')) ? document.getElementById('group').options[document.getElementById('group').selectedIndex].value : '');
+		url += '&group=' + ((document.getElementById('group')) ? document.getElementById('group').value : '');
 		<?php
 		if (isset($_GET['debug'])) {
 			echo "url += '&debug';";
@@ -174,7 +174,7 @@ require_once "resources/header.php";
 			url = source_url;
 			url += '&vd_ext_from=' + document.getElementById('vd_ext_from').value;
 			url += '&vd_ext_to=' + document.getElementById('vd_ext_to').value;
-			url += '&group=' + ((document.getElementById('group')) ? document.getElementById('group').options[document.getElementById('group').selectedIndex].value : '');
+			url += '&group=' + ((document.getElementById('group')) ? document.getElementById('group').value : '');
 			<?php
 			if (isset($_GET['debug'])) {
 				echo "url += '&debug';";
@@ -203,6 +203,16 @@ require_once "resources/header.php";
 		}
 	}
 
+//eavesdrop call
+	function eavesdrop_call(ext, chan_uuid) {
+		if (ext != '' && chan_uuid != '') {
+			cmd = get_eavesdrop_cmd(ext, chan_uuid);
+			if (cmd != '') {
+				send_cmd('exec.php?cmd='+escape(cmd));
+			}
+		}
+	}
+
 //used by call control and ajax refresh functions
 	function send_cmd(url) {
 		if (window.XMLHttpRequest) {// code for IE7+, Firefox, Chrome, Opera, Safari
@@ -241,6 +251,11 @@ require_once "resources/header.php";
 	echo "	return cmd;\n";
 	echo "}\n";
 
+	echo "function get_eavesdrop_cmd(ext, chan_uuid) {\n";
+	echo "	cmd = \"bgapi originate {origination_caller_id_name=".$text['label-eavesdrop'].",origination_caller_id_number=\"+ext+\"}user/".$_SESSION['user']['extensions'][0]."@".$_SESSION['domain_name']." &eavesdrop(\"+chan_uuid+\")\";";
+	echo "	return cmd;\n";
+	echo "}\n";
+
 	echo "function get_record_cmd(uuid) {\n";
 	echo "	cmd = \"uuid_record \"+uuid+\" start ".$_SESSION['switch']['recordings']['dir']."/archive/".date("Y")."/".date("M")."/".date("d")."/\"+uuid+\".wav\";\n";
 	echo "	return cmd;\n";
@@ -426,6 +441,7 @@ require_once "resources/header.php";
 <?php
 
 //create simple array of users own extensions
+unset($_SESSION['user']['extensions']);
 foreach ($_SESSION['user']['extension'] as $assigned_extensions) {
 	$_SESSION['user']['extensions'][] = $assigned_extensions['user'];
 }
diff --git a/app/operator_panel/index_inc.php b/app/operator_panel/index_inc.php
index 4a84e94e6d..a90a56a679 100644
--- a/app/operator_panel/index_inc.php
+++ b/app/operator_panel/index_inc.php
@@ -60,21 +60,32 @@ $groups = array_unique($groups);
 sort($groups);
 
 
-echo "<table cellpadding='0' cellspacing='0' border='0' align='right'>";
-echo "	<tr>";
-echo "		<td>";
 if (sizeof($groups) > 0) {
-	echo 		$text['label-call_group']." ";
-	echo "		<select id='group' class='formfld' onchange='refresh_start();' onfocus='refresh_stop();' onblur='refresh_start();'>\n";
-	echo "			<option value=''></option>";
-	foreach ($groups as $group) {
-		echo "		<option value='".$group."' ".(($_REQUEST['group'] == $group) ? "selected" : null).">".$group."</option>\n";
-	}
-	echo "		</select>\n";
+	echo "<table cellpadding='0' cellspacing='0' border='0' align='right'>";
+	echo "	<tr>";
+	echo "		<td>";
+		echo "		<input type='hidden' id='group' value=\"".$_REQUEST['group']."\">";
+		echo "		<strong style='color: #000;'>".$text['label-call_group']."</strong>&nbsp;&nbsp;";
+		if (sizeof($groups) > 5) {
+			//show select box
+			echo "	<select class='formfld' onchange=\"document.getElementById('group').value = this.options[this.selectedIndex].value; refresh_start();\" onfocus='refresh_stop();' onblur='refresh_start();'>\n";
+			echo "		<option value=''></option>";
+			foreach ($groups as $group) {
+				echo "	<option value='".$group."' ".(($_REQUEST['group'] == $group) ? "selected" : null).">".$group."</option>\n";
+			}
+			echo "	</select>\n";
+		}
+		else {
+			//show buttons
+			echo "	<input type='button' class='btn' value=\"".$text['button-all']."\" onclick=\"document.getElementById('group').value = '';\">";
+			foreach ($groups as $group) {
+				echo "	<input type='button' class='btn' value=\"".$group."\" ".(($_REQUEST['group'] == $group) ? "disabled='disabled'" : null)." onclick=\"document.getElementById('group').value = this.value;\">";
+			}
+		}
+	echo "		</td>";
+	echo "	</tr>";
+	echo "</table>";
 }
-echo "		</td>";
-echo "	</tr>";
-echo "</table>";
 
 echo "<b>".$text['title-operator_panel']."</b>";
 echo "<br><br><br>";
@@ -142,38 +153,47 @@ foreach ($activity as $extension => $ext) {
 	}
 
 	//determine extension draggable state
-	if (!in_array($extension, $_SESSION['user']['extensions'])) {
-		if ($ext_state == "ringing") {
-			if ($_GET['vd_ext_from'] == '' && $dir_icon == 'inbound') {
-				$draggable = true; // selectable - is ringing and not outbound so can transfer away the call (can set as vd_ext_from)
+	if (permission_exists('operator_panel_manage')) {
+		if (!in_array($extension, $_SESSION['user']['extensions'])) {
+			//other extension
+			if ($ext_state == "ringing") {
+				if ($_GET['vd_ext_from'] == '' && $dir_icon == 'inbound') {
+					$draggable = true; // selectable - is ringing and not outbound so can transfer away the call (can set as vd_ext_from)
+				}
+				else {
+					$draggable = false; // unselectable - is ringing so can't send a call to the ext (can't set as vd_ext_to)
+				}
+			}
+			else if ($ext_state == 'active') {
+				$draggable = false; // unselectable - on a call already so can't transfer or send a call to the ext (can't set as vd_ext_from or vd_ext_to)
+			}
+			else { // idle
+				if ($_GET['vd_ext_from'] == '') {
+					$draggable = false; // unselectable - is idle, but can't initiate a call from the ext as is not assigned to user (can't set as vd_ext_from)
+				}
+				else {
+					$draggable = true; // selectable - is idle, so can transfer a call in to ext (can set as vd_ext_to).
+				}
+			}
+		}
+		else {
+			//user extension
+			if ($ext['uuid'] != '' && $ext['uuid'] == $ext['call_uuid'] && $ext['variable_bridge_uuid'] == '') {
+				$draggable = false;
+			}
+			else if ($ext_state == 'ringing' && $ext['variable_call_direction'] == 'local') {
+				$draggable = false;
+			}
+			else if ($ext_state != '' && !$format_number) {
+				$draggable = false;
 			}
 			else {
-				$draggable = false; // unselectable - is ringing so can't send a call to the ext (can't set as vd_ext_to)
+				$draggable = true;
 			}
 		}
-		else if ($ext_state == 'active') {
-			$draggable = false; // unselectable - on a call already so can't transfer or send a call to the ext (can't set as vd_ext_from or vd_ext_to)
-		}
-		else { // idle
-			if ($_GET['vd_ext_from'] == '') {
-				$draggable = false; // unselectable - is idle, but can't initiate a call from the ext as is not assigned to user (can't set as vd_ext_from)
-			}
-			else {
-				$draggable = true; // selectable - is idle, so can transfer a call in to ext (can set as vd_ext_to).
-			}
-		}
-	}
-	else if ($ext['uuid'] != '' && $ext['uuid'] == $ext['call_uuid'] && $ext['variable_bridge_uuid'] == '') {
-		$draggable = false;
-	}
-	else if ($ext_state == 'ringing' && $ext['variable_call_direction'] == 'local') {
-		$draggable = false;
-	}
-	else if ($ext_state != '' && !$format_number) {
-		$draggable = false;
 	}
 	else {
-		$draggable = true;
+		$draggable = false;
 	}
 
 	//determine extension (user) status
@@ -209,7 +229,7 @@ foreach ($activity as $extension => $ext) {
 	$block .= "		</td>";
 	$block .= "		<td class='ext_info ".$style."'>";
 	if ($dir_icon != '') {
-		$block .= "			<img src='resources/images/".$dir_icon.".png' align='right' style='margin-top: 2px; width: 12px; height: 12px;' draggable='false'>";
+		$block .= "			<img src='resources/images/".$dir_icon.".png' align='right' style='margin-top: 3px; margin-right: 1px; width: 12px; height: 12px;' draggable='false'>";
 	}
 	$block .= "			<span class='user_info'>";
 	if ($ext['effective_caller_id_name'] != '' && $ext['effective_caller_id_name'] != $extension) {
@@ -222,8 +242,13 @@ foreach ($activity as $extension => $ext) {
 	if ($ext_state != '') {
 		$block .= "		<span class='caller_info'>";
 		$block .= "			<table align='right'><tr><td style='text-align: right;'>";
-		$block .= "				<span class='call_info'>".$ext['call_length']."</span>";
-		if (in_array($extension, $_SESSION['user']['extensions'])) {
+		$block .= "				<span class='call_info'>".$ext['call_length']."</span><br>";
+		//eavesdrop
+		if (permission_exists('operator_panel_eavesdrop') && $ext_state == 'active' && !in_array($extension, $_SESSION['user']['extensions'])) {
+			$block .= 			"<img src='resources/images/eavesdrop.png' style='width: 12px; height: 12px; border: none; margin: 4px 0px 0px 5px; cursor: pointer;' title='".$text['label-eavesdrop']."' onclick=\"eavesdrop_call('".$extension."','".$call_identifier."');\">";
+		}
+		//kill
+		if (in_array($extension, $_SESSION['user']['extensions']) || permission_exists('operator_panel_kill')) {
 			if ($ext['variable_bridge_uuid'] == '' && $ext_state == 'ringing') {
 				$call_identifier_kill = $ext['uuid'];
 			}
@@ -233,7 +258,7 @@ foreach ($activity as $extension => $ext) {
 			else {
 				$call_identifier_kill = $call_identifier;
 			}
-			$block .= "		<br><img src='resources/images/kill.png' style='width: 12px; height: 12px; border: none; margin-top: 4px; margin-right: -1px; cursor: pointer;' onclick=\"kill_call('".$call_identifier_kill."');\">";
+			$block .= 			"<img src='resources/images/kill.png' style='width: 12px; height: 12px; border: none; margin: 4px 0px 0px 5px; cursor: pointer;' title='".$text['label-kill']."' onclick=\"kill_call('".$call_identifier_kill."');\">";
 		}
 		$block .= "			</td></tr></table>";
 		$block .= "			<strong>".$call_name."</strong><br>".$call_number;
diff --git a/app/operator_panel/resources/images/eavesdrop.png b/app/operator_panel/resources/images/eavesdrop.png
new file mode 100644
index 0000000000..af19bfe813
Binary files /dev/null and b/app/operator_panel/resources/images/eavesdrop.png differ