diff --git a/app/time_conditions/time_condition_edit.php b/app/time_conditions/time_condition_edit.php
index 203d97f9d3..e0fe29a6d9 100644
--- a/app/time_conditions/time_condition_edit.php
+++ b/app/time_conditions/time_condition_edit.php
@@ -896,37 +896,30 @@
 </script>
 
 <?php
-echo "<form method='post' name='frm' action='' onsubmit=\"return check_submit();\">\n";
+echo "<form method='post' name='frm' onsubmit=\"return check_submit();\">\n";
 
-echo "<table width='100%' border='0' cellpadding='0' cellspacing='0'>\n";
-echo "	<tr>\n";
-echo "		<td align='left' valign='top'>\n";
-echo "			<span class='title'>".$text['title-time_condition']."</span>";
-echo "			<br /><br />\n";
-echo "		</td>\n";
-echo "		<td align='right' valign='top'>\n";
-echo "			<input type='button' class='btn' name='' alt='".$text['button-back']."' onclick=\"window.location='".PROJECT_PATH."/app/time_conditions/time_conditions.php?app_uuid=4b821450-926b-175a-af93-a03c441818b1'\" value='".$text['button-back']."'>\n";
+echo "<div class='action_bar' id='action_bar'>\n";
+echo "	<div class='heading'><b>".$text['title-time_condition']."</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'=>PROJECT_PATH.'/app/time_conditions/time_conditions.php?app_uuid=4b821450-926b-175a-af93-a03c441818b1']);
 if (if_group("superadmin") && $action == 'update') {
-	echo "		<input type='button' class='btn' name='' alt='".$text['button-dialplan']."' onclick=\"document.location.href='".PROJECT_PATH."/app/dialplans/dialplan_edit.php?id=".$dialplan_uuid."&app_uuid=4b821450-926b-175a-af93-a03c441818b1'\" value='".$text['button-dialplan']."'>\n";
+	echo button::create(['type'=>'button','label'=>$text['button-dialplan'],'icon'=>'list','style'=>'margin-right: 15px;','link'=>PROJECT_PATH.'/app/dialplans/dialplan_edit.php?id='.urlencode($dialplan_uuid).'&app_uuid=4b821450-926b-175a-af93-a03c441818b1']);
 }
-echo "			<input type='submit' name='submit' class='btn' value='".$text['button-save']."'>\n";
-echo "		</td>\n";
-echo "	</tr>\n";
-echo "	<tr>\n";
-echo "		<td colspan='2'>\n";
-echo "			".$text['description-time_conditions']."\n";
-echo "		</td>\n";
-echo "	</tr>\n";
-echo "</table>";
-echo "<br />\n";
+echo button::create(['type'=>'submit','label'=>$text['button-save'],'icon'=>$_SESSION['theme']['button_icon_save']]);
+echo "	</div>\n";
+echo "	<div style='clear: both;'></div>\n";
+echo "</div>\n";
+
+echo $text['description-time_conditions']."\n";
+echo "<br /><br />\n";
 
 echo "<table width='100%' border='0' cellpadding='0' cellspacing='0'>\n";
 
 echo "<tr>\n";
-echo "<td width='20%' class='vncellreq' 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 width='80%' class='vtable' align='left'>\n";
+echo "<td width='70%' class='vtable' align='left'>\n";
 echo "    <input class='formfld' type='text' name='dialplan_name' maxlength='255' value=\"".escape($dialplan_name)."\">\n";
 echo "	<br />\n";
 echo "	".$text['description-name']."\n";
@@ -1154,7 +1147,7 @@ if ($action == 'update') {
 		echo "	<table border='0' cellpadding='2' cellspacing='0' style='margin: -2px;'>\n";
 		echo "		<tr>";
 		echo "			<td>";
-		echo "				<input type='button' class='btn' name='' alt='".$text['button-advanced']."' onclick=\"$(this).fadeOut(400, function() { $('#default_preset_destination').fadeIn(400); document.getElementById('default_preset_destination_description').innerHTML += '<br>".$text['description-presets_advanced']."'; });\" value='".$text['button-advanced']."'>\n";
+		echo button::create(['type'=>'button','label'=>$text['button-advanced'],'icon'=>'tools','onclick'=>"$(this).fadeOut(400, function() { $('#default_preset_destination').fadeIn(400); document.getElementById('default_preset_destination_description').innerHTML += '<br>".$text['description-presets_advanced']."'; });"]);
 		echo "				<span id='default_preset_destination' style=' display: none;'>";
 		echo 				$destination->select('dialplan', 'default_preset_action', $dialplan_action);
 		echo "				</span>";
@@ -1257,20 +1250,16 @@ if ($action == 'update') {
 	echo "</tr>\n";
 
 	echo "</table>\n";
-	echo "<br />";
+	echo "<br /><br />\n";
 
-	echo "<div align='right'>\n";
 	if ($action == "update") {
-		echo "	<input type='hidden' name='dialplan_uuid' value='".escape($dialplan_uuid)."'>\n";
+		echo "<input type='hidden' name='dialplan_uuid' value='".escape($dialplan_uuid)."'>\n";
 	}
-	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 "</div>";
+	echo "<input type='hidden' name='".$token['name']."' value='".$token['hash']."'>\n";
 
 	echo "</form>";
-	echo "<br />";
 
 //include the footer
 	require_once "resources/footer.php";
 
-?>
+?>
\ No newline at end of file