diff --git a/panels_ipe/css/panels_ipe.css b/panels_ipe/css/panels_ipe.css
index 88da068..2ad0c23 100644
--- a/panels_ipe/css/panels_ipe.css
+++ b/panels_ipe/css/panels_ipe.css
@@ -380,9 +380,10 @@ div.panels-ipe-control .form-submit {
   padding: 0 0.8em 2px 34px;
 }
 
-input#panels-ipe-save, input#panels-ipe-cancel,
-input#panels-ipe-save:hover, input#panels-ipe-cancel:hover,
-input#panels-ipe-save:active, input#panels-ipe-cancel:active {
+
+input#edit-save-default, input#panels-ipe-save, input#panels-ipe-cancel, input#edit-revert-default,
+input#edit-save-default:hover, input#panels-ipe-save:hover, input#panels-ipe-cancel:hover,
+input#edit-save-default:active, input#panels-ipe-save:active, input#panels-ipe-cancel:active {
   background-repeat: no-repeat;
 }
 
@@ -394,6 +395,7 @@ div.panels-ipe-pseudobutton-container a {
   text-decoration: none;
 }
 
+input#edit-save-default,
 input#panels-ipe-save {
   background-image: url(../images/icon-save.png);
   background-image: url(../images/icon-save.png), linear-gradient(bottom, #383838 0%, #666666 100%);
@@ -411,6 +413,7 @@ input#panels-ipe-save {
   );
 }
 
+input#edit-revert-default,
 input#panels-ipe-cancel {
   background-image: url(../images/icon-close.png);
   background-image: url(../images/icon-close.png), linear-gradient(bottom, #383838 0%, #666666 100%);
diff --git a/panels_ipe/js/panels_ipe.js b/panels_ipe/js/panels_ipe.js
index b127df1..76b3b54 100644
--- a/panels_ipe/js/panels_ipe.js
+++ b/panels_ipe/js/panels_ipe.js
@@ -414,7 +414,7 @@ $(function() {
 
   Drupal.ajax.prototype.ipeReplacedBeforeSerialize = Drupal.ajax.prototype.beforeSerialize;
   Drupal.ajax.prototype.beforeSerialize = function (element_settings, options) {
-    if ($(this.element).attr('id') == 'panels-ipe-save') {
+    if ($(this.element).is('.panels-ipe-save')) {
       Drupal.PanelsIPE.editors[this.element_settings.ipe_cache_key].saveEditing();
     };
     return this.ipeReplacedBeforeSerialize(element_settings, options);
diff --git a/panels_ipe/plugins/display_renderers/panels_renderer_ipe.class.php b/panels_ipe/plugins/display_renderers/panels_renderer_ipe.class.php
index 1666454..16928c1 100644
--- a/panels_ipe/plugins/display_renderers/panels_renderer_ipe.class.php
+++ b/panels_ipe/plugins/display_renderers/panels_renderer_ipe.class.php
@@ -433,6 +433,7 @@ function panels_ipe_edit_control_form($form, &$form_state) {
     '#id' => 'panels-ipe-save',
     '#submit' => array('panels_edit_display_form_submit'),
     '#save-display' => TRUE,
+    '#attributes' => array('class' => array('panels-ipe-save')),
   );
   $form['buttons']['cancel'] = array(
     '#type' => 'submit',
