diff --git a/app/call_broadcast/app_languages.php b/app/call_broadcast/app_languages.php
index 797d8913e6..1a0f470a32 100644
--- a/app/call_broadcast/app_languages.php
+++ b/app/call_broadcast/app_languages.php
@@ -661,45 +661,45 @@ $text['confirm-add']['ru-ru'] = "Добавление завершено";
 $text['confirm-add']['sv-se'] = "Tillagd";
 $text['confirm-add']['uk-ua'] = "Додано";
 
-$text['button-stop']['en-us'] = "Stop Broadcast";
-$text['button-stop']['ar-eg'] = "";
-$text['button-stop']['de-at'] = "Rundruf beenden"; //copied from de-de
-$text['button-stop']['de-ch'] = "Rundruf beenden"; //copied from de-de
-$text['button-stop']['de-de'] = "Rundruf beenden";
-$text['button-stop']['es-cl'] = "Detener Broadcast";
-$text['button-stop']['es-mx'] = "Detener Broadcast"; //copied from es-cl
-$text['button-stop']['fr-ca'] = "Arrêter la diffusion"; //copied from fr-fr
-$text['button-stop']['fr-fr'] = "Arrêter la diffusion";
-$text['button-stop']['he-il'] = "";
-$text['button-stop']['it-it'] = "Interrompi Chiamate";
-$text['button-stop']['nl-nl'] = "Stop omroep";
-$text['button-stop']['pl-pl'] = "Zatrzymaj rozsylanie rozmów";
-$text['button-stop']['pt-br'] = "Pausar Broadcast";
-$text['button-stop']['pt-pt'] = "Parar Broadcast";
-$text['button-stop']['ro-ro'] = "";
-$text['button-stop']['ru-ru'] = "Остановить";
-$text['button-stop']['sv-se'] = "Stoppa Samtalsdistribution";
-$text['button-stop']['uk-ua'] = "Зупинити трансляцію";
+$text['button-stop_broadcast']['en-us'] = "Stop Broadcast";
+$text['button-stop_broadcast']['ar-eg'] = "";
+$text['button-stop_broadcast']['de-at'] = "Rundruf beenden"; //copied from de-de
+$text['button-stop_broadcast']['de-ch'] = "Rundruf beenden"; //copied from de-de
+$text['button-stop_broadcast']['de-de'] = "Rundruf beenden";
+$text['button-stop_broadcast']['es-cl'] = "Detener Broadcast";
+$text['button-stop_broadcast']['es-mx'] = "Detener Broadcast"; //copied from es-cl
+$text['button-stop_broadcast']['fr-ca'] = "Arrêter la diffusion"; //copied from fr-fr
+$text['button-stop_broadcast']['fr-fr'] = "Arrêter la diffusion";
+$text['button-stop_broadcast']['he-il'] = "";
+$text['button-stop_broadcast']['it-it'] = "Interrompi Chiamate";
+$text['button-stop_broadcast']['nl-nl'] = "Stop omroep";
+$text['button-stop_broadcast']['pl-pl'] = "Zatrzymaj rozsylanie rozmów";
+$text['button-stop_broadcast']['pt-br'] = "Pausar Broadcast";
+$text['button-stop_broadcast']['pt-pt'] = "Parar Broadcast";
+$text['button-stop_broadcast']['ro-ro'] = "";
+$text['button-stop_broadcast']['ru-ru'] = "Остановить";
+$text['button-stop_broadcast']['sv-se'] = "Stoppa Samtalsdistribution";
+$text['button-stop_broadcast']['uk-ua'] = "Зупинити трансляцію";
 
-$text['button-send']['en-us'] = "Send Broadcast";
-$text['button-send']['ar-eg'] = "";
-$text['button-send']['de-at'] = "Rundruf senden"; //copied from de-de
-$text['button-send']['de-ch'] = "Rundruf senden"; //copied from de-de
-$text['button-send']['de-de'] = "Rundruf senden";
-$text['button-send']['es-cl'] = "Enviar Llamada Masiva";
-$text['button-send']['es-mx'] = "Enviar Llamada Masiva"; //copied from es-cl
-$text['button-send']['fr-ca'] = "Lancer les appels"; //copied from fr-fr
-$text['button-send']['fr-fr'] = "Lancer les appels";
-$text['button-send']['he-il'] = "נשלח";
-$text['button-send']['it-it'] = "Invia Chiamate";
-$text['button-send']['nl-nl'] = "Verstuur omroep";
-$text['button-send']['pl-pl'] = "Wysłane";
-$text['button-send']['pt-br'] = "Enviar Broadcast"; //copied from pt-pt
-$text['button-send']['pt-pt'] = "Enviar Broadcast";
-$text['button-send']['ro-ro'] = "";
-$text['button-send']['ru-ru'] = "Запустить";
-$text['button-send']['sv-se'] = "Skicka Samtalsdistribution";
-$text['button-send']['uk-ua'] = "Транслювати";
+$text['button-start_broadcast']['en-us'] = "Start Broadcast";
+$text['button-start_broadcast']['ar-eg'] = "";
+$text['button-start_broadcast']['de-at'] = "Rundruf senden"; //copied from de-de
+$text['button-start_broadcast']['de-ch'] = "Rundruf senden"; //copied from de-de
+$text['button-start_broadcast']['de-de'] = "Rundruf senden";
+$text['button-start_broadcast']['es-cl'] = "Enviar Llamada Masiva";
+$text['button-start_broadcast']['es-mx'] = "Enviar Llamada Masiva"; //copied from es-cl
+$text['button-start_broadcast']['fr-ca'] = "Lancer les appels"; //copied from fr-fr
+$text['button-start_broadcast']['fr-fr'] = "Lancer les appels";
+$text['button-start_broadcast']['he-il'] = "נשלח";
+$text['button-start_broadcast']['it-it'] = "Invia Chiamate";
+$text['button-start_broadcast']['nl-nl'] = "Verstuur omroep";
+$text['button-start_broadcast']['pl-pl'] = "Wysłane";
+$text['button-start_broadcast']['pt-br'] = "Enviar Broadcast"; //copied from pt-pt
+$text['button-start_broadcast']['pt-pt'] = "Enviar Broadcast";
+$text['button-start_broadcast']['ro-ro'] = "";
+$text['button-start_broadcast']['ru-ru'] = "Запустить";
+$text['button-start_broadcast']['sv-se'] = "Skicka Samtalsdistribution";
+$text['button-start_broadcast']['uk-ua'] = "Транслювати";
 
 $text['file-error']['en-us'] = "Sorry, File type not allowed";
 $text['file-error']['ar-eg'] = "";
diff --git a/app/call_broadcast/call_broadcast_edit.php b/app/call_broadcast/call_broadcast_edit.php
index 2b4363c064..9fc70855ae 100644
--- a/app/call_broadcast/call_broadcast_edit.php
+++ b/app/call_broadcast/call_broadcast_edit.php
@@ -284,32 +284,32 @@ if (count($_POST) > 0 && strlen($_POST["persistformvar"]) == 0) {
 	require_once "resources/header.php";
 
 //begin content
-	echo "<form method='post' name='frm' action='' enctype='multipart/form-data'>\n";
+	echo "<form name='frm' method='post' enctype='multipart/form-data'>\n";
 
-	echo "<div style='float: right;'>\n";
-	echo "	<input type='button' class='btn' style='margin-right: 15px;' name='back' alt='".$text['button-back']."' onclick=\"window.location='call_broadcast.php'\" value='".$text['button-back']."'>\n";
+	echo "<div class='action_bar' id='action_bar'>\n";
+	echo "	<div class='heading'><b>".$text['title-call_broadcast']."</b></div>\n";
+	echo "	<div class='actions'>\n";
+	echo button::create(['type'=>'button','label'=>$text['button-back'],'icon'=>$_SESSION['theme']['button_icon_back'],'style'=>'margin-right: 15px;','link'=>'call_broadcast.php']);
 	if ($action == "update") {
 		if (permission_exists('call_broadcast_delete')) {
-			echo button::create(['type'=>'submit','label'=>$text['button-delete'],'icon'=>$_SESSION['theme']['button_icon_delete'],'name'=>'action','value'=>'delete','onclick'=>"if (confirm('".$text['confirm-delete']."')) { document.getElementById('frm').submit(); } else { this.blur(); return false; }",'style'=>'margin-right: 15px;']);
+			echo button::create(['type'=>'submit','label'=>$text['button-delete'],'icon'=>$_SESSION['theme']['button_icon_delete'],'name'=>'action','value'=>'delete','style'=>'margin-right: 15px;','onclick'=>"if (!confirm('".$text['confirm-delete']."')) { this.blur(); return false; }"]);
 		}
-		echo "<input type='hidden' name='call_broadcast_uuid' value='".escape($call_broadcast_uuid)."'>\n";
-		echo "<input type='button' class='btn' name='' alt='".$text['button-send']."' onclick=\"window.location='call_broadcast_send.php?id=".urlencode($call_broadcast_uuid)."'\" value='".$text['button-send']."'>\n";
-		echo "<input type='button' class='btn' style='margin-right: 15px;' name='' alt='".$text['button-stop']."' onclick=\"window.location='call_broadcast_stop.php?id=".urlencode($call_broadcast_uuid)."'\" value='".$text['button-stop']."'>\n";
+		echo button::create(['type'=>'button','label'=>$text['button-start'],'icon'=>$_SESSION['theme']['button_icon_start'],'link'=>'call_broadcast_send.php?id='.urlencode($call_broadcast_uuid)]);
+		echo button::create(['type'=>'button','label'=>$text['button-stop'],'icon'=>$_SESSION['theme']['button_icon_stop'],'link'=>'call_broadcast_stop.php?id='.urlencode($call_broadcast_uuid)]);
 	}
-	echo "	<input type='submit' class='btn' name='submit' value='".$text['button-save']."'>\n";
+	echo button::create(['type'=>'submit','label'=>$text['button-save'],'icon'=>$_SESSION['theme']['button_icon_save'],'style'=>'margin-left: 15px;']);
+	echo "	</div>\n";
+	echo "	<div style='clear: both;'></div>\n";
 	echo "</div>\n";
 
-	echo "<b>".$text['title-call_broadcast']."</b>\n";
-	echo "<br><br>\n";
-
 	echo "<table width='100%' border='0' cellpadding='0' cellspacing='0'>\n";
 
 	echo "<tr>\n";
-	echo "<td class='vncellreq' width='30%' valign='top' align='left' nowrap>\n";
+	echo "<td width='30%' class='vncellreq' valign='top' align='left' nowrap>\n";
 	echo "	".$text['label-name']."\n";
 	echo "</td>\n";
-	echo "<td class='vtable' align='left'>\n";
-	echo "	<input class='formfld' width='70%' type='text' name='broadcast_name' maxlength='255' value=\"".escape($broadcast_name)."\" required='required'>\n";
+	echo "<td width='70%' class='vtable' align='left'>\n";
+	echo "	<input class='formfld' type='text' name='broadcast_name' maxlength='255' value=\"".escape($broadcast_name)."\" required='required'>\n";
 	echo "<br />\n";
 	echo "".$text['description-name']."\n";
 	echo "</td>\n";
@@ -485,15 +485,14 @@ if (count($_POST) > 0 && strlen($_POST["persistformvar"]) == 0) {
 	echo "</td>\n";
 	echo "</tr>\n";
 
-	echo "	<tr>\n";
-	echo "		<td colspan='2' align='right'>\n";
-	echo "			<br>";
-	echo "			<input type='hidden' name='".$token['name']."' value='".$token['hash']."'>\n";
-	echo "			<input type='submit' name='submit' class='btn' value='".$text['button-save']."'>\n";
-	echo "		</td>\n";
-	echo "	</tr>";
 	echo "</table>";
 	echo "<br><br>";
+
+	if ($action == "update") {
+		echo "<input type='hidden' name='call_broadcast_uuid' value='".escape($call_broadcast_uuid)."'>\n";
+	}
+	echo "<input type='hidden' name='".$token['name']."' value='".$token['hash']."'>\n";
+
 	echo "</form>";
 
 	/*
@@ -656,4 +655,4 @@ if (count($_POST) > 0 && strlen($_POST["persistformvar"]) == 0) {
 //include the footer
 	require_once "resources/footer.php";
 
-?>
+?>
\ No newline at end of file