diff --git a/app/coffeescripts/calendar/EditAppointmentGroupDialog.coffee b/app/coffeescripts/calendar/EditAppointmentGroupDialog.coffee
index 506e66cd568..d68395e887f 100644
--- a/app/coffeescripts/calendar/EditAppointmentGroupDialog.coffee
+++ b/app/coffeescripts/calendar/EditAppointmentGroupDialog.coffee
@@ -33,12 +33,12 @@ define [
         ]
       else
         [
-          text: I18n.t 'save_and_publish', 'Save & Publish'
-          'class' : 'ui-button-primary'
-          click: @appointmentGroupsForm.saveClick
-        ,
           text: I18n.t 'save', 'Save'
           click: @appointmentGroupsForm.saveWithoutPublishingClick
+        ,
+          text: I18n.t 'save_and_publish', 'Save & Publish'
+          'class' : 'btn-primary'
+          click: @appointmentGroupsForm.saveClick
         ]
 
       dialog.dialog('option', 'buttons', buttons).dialog('open')
diff --git a/app/coffeescripts/calendar/ShowEventDetailsDialog.coffee b/app/coffeescripts/calendar/ShowEventDetailsDialog.coffee
index 7b3168aa13b..ae722dc2eeb 100644
--- a/app/coffeescripts/calendar/ShowEventDetailsDialog.coffee
+++ b/app/coffeescripts/calendar/ShowEventDetailsDialog.coffee
@@ -57,14 +57,14 @@ define [
           width: 450
           buttons: if error.reschedulable
                      [
+                       text: I18n.t 'do_nothing', 'Do Nothing'
+                       click: -> $dialog.dialog('close')
+                     ,
                        text: I18n.t 'reschedule', 'Reschedule'
-                       'class': 'ui-button-primary'
+                       'class': 'btn-primary'
                        click: =>
                          $dialog.disableWhileLoading @reserveEvent({cancel_existing:true}).always ->
                            $dialog.dialog('close')
-                     ,
-                       text: I18n.t 'do_nothing', 'Do Nothing'
-                       click: -> $dialog.dialog('close')
                      ]
                    else
                      [
diff --git a/app/coffeescripts/conversations/Inbox.coffee b/app/coffeescripts/conversations/Inbox.coffee
index 748a39b6425..e9a390280b4 100644
--- a/app/coffeescripts/conversations/Inbox.coffee
+++ b/app/coffeescripts/conversations/Inbox.coffee
@@ -542,14 +542,12 @@ define [
           width: 510
           title: I18n.t('title.forward_messages', 'Forward Messages')
           buttons: [
-            {
-              text: I18n.t('buttons.send_message', 'Send')
-              click: -> $(this).submit()
-            }
-            {
-              text: I18n.t('#buttons.cancel', 'Cancel')
-              click: -> $(this).dialog('close')
-            }
+            text: I18n.t('#buttons.cancel', 'Cancel')
+            click: -> $(this).dialog('close')
+          ,
+            text: I18n.t('buttons.send_message', 'Send')
+            click: -> $(this).submit()
+            class: 'btn-primary'
           ]
           open: =>
             @$forwardForm.attr action: '/conversations?' + $.param(@conversations.baseData())
diff --git a/app/coffeescripts/views/Dashboard/DashboardView.coffee b/app/coffeescripts/views/Dashboard/DashboardView.coffee
index 3c0746a5cc8..575e3ea8152 100644
--- a/app/coffeescripts/views/Dashboard/DashboardView.coffee
+++ b/app/coffeescripts/views/Dashboard/DashboardView.coffee
@@ -49,12 +49,12 @@ define [
       createCourseForm.dialog
         title: I18n.t('creating_course', 'Creating a course...')
         buttons: [
-          text: I18n.t 'create', 'Create'
-          'class' : 'ui-button-primary'
-          click: -> createCourseForm.submit()
-        ,
           text: I18n.t 'cancel', 'Cancel'
           click: -> createCourseForm.data('dialog').close()
+        ,
+          text: I18n.t 'create', 'Create'
+          'class' : 'btn-primary'
+          click: -> createCourseForm.submit()
         ]
       dialog = createCourseForm.data('dialog')
       createCourseForm.formSubmit
diff --git a/public/javascripts/jquery.instructure_misc_plugins.js b/public/javascripts/jquery.instructure_misc_plugins.js
index 6a3ea1939bd..6f85b7d0816 100644
--- a/public/javascripts/jquery.instructure_misc_plugins.js
+++ b/public/javascripts/jquery.instructure_misc_plugins.js
@@ -135,12 +135,12 @@ define([
           close: onContinue,
           buttons: [
             {
-              text: I18n.t('#buttons.delete', 'Delete'),
-              'class': 'ui-button-primary',
-              click: function() { result = true; $(this).dialog('close'); }
-            }, {
               text: I18n.t('#buttons.cancel', 'Cancel'),
               click: function() { $(this).dialog('close'); } // ; onContinue();
+            }, {
+              text: I18n.t('#buttons.delete', 'Delete'),
+              'class': 'btn-primary',
+              click: function() { result = true; $(this).dialog('close'); }
             }
           ]
         }, dialog_options));
diff --git a/spec/selenium/scheduler_spec.rb b/spec/selenium/scheduler_spec.rb
index e7cbf1d542e..ac2af781af0 100644
--- a/spec/selenium/scheduler_spec.rb
+++ b/spec/selenium/scheduler_spec.rb
@@ -41,7 +41,7 @@ describe "scheduler" do
   end
 
   def submit_appointment_group_form(publish = true)
-    save_and_publish, save = ff('.ui-dialog-buttonset .ui-button')
+    save, save_and_publish = ff('.ui-dialog-buttonset .ui-button')
     if publish
       save_and_publish.click
     else
@@ -154,7 +154,7 @@ describe "scheduler" do
       open_edit_dialog
       edit_form = f('#edit_appointment_form')
       keep_trying_until { edit_form.should be_displayed }
-      f('.ui-dialog-buttonset .ui-button-primary').click
+      f('.ui-dialog-buttonset .btn-primary').click
       wait_for_ajaximations
       new_appointment_group.reload
       new_appointment_group.workflow_state.should == 'active'
@@ -427,7 +427,7 @@ describe "scheduler" do
       section_box.click
       course_box[:checked].should be_true
 
-      f('.ui-dialog-buttonset .ui-button-primary').click
+      f('.ui-dialog-buttonset .btn-primary').click
       wait_for_ajaximations
       ag = AppointmentGroup.first
       ag.contexts.should include course1