diff --git a/modules/calendarmodule/actions/edit.php b/modules/calendarmodule/actions/edit.php
index 22266c58da..de7a4a88a5 100644
--- a/modules/calendarmodule/actions/edit.php
+++ b/modules/calendarmodule/actions/edit.php
@@ -121,9 +121,28 @@
 	if (isset($_GET['id']) && $_GET['id'] != 0) {
 		$form->unregister('submit');
 //		$buttons = "<div id=\"submitControl\" class=\"control buttongroup\"> ";
-		$buttons = "<input name=\"submitSubmit\" class=\"button\" type=\"submit\" value=\"Save\" onclick=\"if (checkRequired(this.form)) { if (validate(this.form)) { return true; } else { return false; } } else { return false; }\" /> ";
-		$buttons .= "<input name=\"submitNew\" class=\"button\" type=\"submit\" value=\"Save as New Event\" onclick=\"if (checkRequired(this.form)) { if (validate(this.form)) { return true; } else { return false; } } else { return false; }\" /> ";
-		$buttons .= "<input class=\"button\" type=\"button\" value=\"Cancel\" onclick=\"document.location.href='".exponent_flow_get()."'\" /> ";
+//		$buttons = "<input name=\"submitSubmit\" class=\"button\" type=\"submit\" value=\"Save\" onclick=\"if (checkRequired(this.form)) { if (validate(this.form)) { return true; } else { return false; } } else { return false; }\" /> ";
+		$buttons = '<button name="submitSubmit" type="submit" id="'.$_GET['id'].'Submit" class="submit button awesome '.BTN_SIZE.' '.BTN_COLOR;
+		$buttons .='" type="submit" value="' . "Save" . '"';
+		$buttons .= ' onclick="if (checkRequired(this.form)) { if (validate(this.form)) { return true; } else { return false; } } else { return false; }"';
+		$buttons .= ' />';
+		$buttons .= "Save";
+		$buttons .= ' </button>';
+
+//		$buttons .= "<input name=\"submitNew\" class=\"button\" type=\"submit\" value=\"Save as New Event\" onclick=\"if (checkRequired(this.form)) { if (validate(this.form)) { return true; } else { return false; } } else { return false; }\" /> ";
+		$buttons .= '<button name="submitNew" type="submit" id="'.$_GET['id'].'Submit" class="submit button awesome '.BTN_SIZE.' '.BTN_COLOR;
+		$buttons .='" type="submit" value="' . "Save as New Event" . '"';
+		$buttons .= ' onclick="if (checkRequired(this.form)) { if (validate(this.form)) { return true; } else { return false; } } else { return false; }"';
+		$buttons .= ' />';
+		$buttons .= "Save as New Event";
+		$buttons .= ' </button>';
+
+//		$buttons .= "<input class=\"button\" type=\"button\" value=\"Cancel\" onclick=\"document.location.href='".exponent_flow_get()."'\" /> ";
+		$buttons .= '<button type="cancel" class="cancel button awesome '.BTN_SIZE.' '.BTN_COLOR.'" onclick="document.location.href=\''.exponent_flow_get().'\'; return false;"';
+		$buttons .= '>';
+		$buttons .= "Cancel";
+		$buttons .= '</button>';
+		
 //		$buttons .= "</div>";
 		$form->register(null,'',new htmlcontrol($buttons));
 	}
diff --git a/modules/calendarmodule/views/_form_edit.tpl b/modules/calendarmodule/views/_form_edit.tpl
index 8bfc078bf8..f97a8ad1f9 100644
--- a/modules/calendarmodule/views/_form_edit.tpl
+++ b/modules/calendarmodule/views/_form_edit.tpl
@@ -21,6 +21,10 @@
 
 {/css}
 
+{css unique="calendar-edit3" link="`$smarty.const.PATH_RELATIVE`framework/core/assets/css/button.css"}
+
+{/css}
+
 <div class="module calendar edit">
 	<div class="form_title">
 		<h1>{if $is_edit == 1}{$_TR.form_title_edit}{else}{$_TR.form_title_new}{/if}</h1>