diff --git a/modules/checkout/includes/commerce_checkout.admin.inc b/modules/checkout/includes/commerce_checkout.admin.inc
index c0f0d19..6f36b4a 100644
--- a/modules/checkout/includes/commerce_checkout.admin.inc
+++ b/modules/checkout/includes/commerce_checkout.admin.inc
@@ -73,9 +73,8 @@ function commerce_checkout_builder_form($form, &$form_state) {
   }
 
   $form['actions'] = array(
-    '#type' => 'container',
+    '#type' => 'actions',
     '#tree' => FALSE,
-    '#attributes' => array('class' => array('form-actions')),
   );
   $form['actions']['submit'] = array(
     '#type' => 'submit',
diff --git a/modules/customer/includes/commerce_customer_profile.forms.inc b/modules/customer/includes/commerce_customer_profile.forms.inc
index 768ee88..5b9fb9b 100644
--- a/modules/customer/includes/commerce_customer_profile.forms.inc
+++ b/modules/customer/includes/commerce_customer_profile.forms.inc
@@ -98,8 +98,7 @@ function commerce_customer_customer_profile_form($form, &$form_state, $profile)
   }
 
   $form['actions'] = array(
-    '#type' => 'container',
-    '#attributes' => array('class' => array('form-actions')),
+    '#type' => 'actions',
     '#weight' => 100,
   );
 
diff --git a/modules/order/includes/commerce_order.forms.inc b/modules/order/includes/commerce_order.forms.inc
index 9158389..3e684ba 100644
--- a/modules/order/includes/commerce_order.forms.inc
+++ b/modules/order/includes/commerce_order.forms.inc
@@ -159,8 +159,7 @@ function commerce_order_order_form($form, &$form_state, $order) {
   );
 
   $form['actions'] = array(
-    '#type' => 'container',
-    '#attributes' => array('class' => array('form-actions')),
+    '#type' => 'actions',
     '#weight' => 100,
   );
 
diff --git a/modules/product/includes/commerce_product.forms.inc b/modules/product/includes/commerce_product.forms.inc
index 9515e41..cbf0a13 100644
--- a/modules/product/includes/commerce_product.forms.inc
+++ b/modules/product/includes/commerce_product.forms.inc
@@ -85,8 +85,7 @@ function commerce_product_product_form($form, &$form_state, $product) {
   );
 
   $form['actions'] = array(
-    '#type' => 'container',
-    '#attributes' => array('class' => array('form-actions')),
+    '#type' => 'actions',
     '#weight' => 400,
   );
 
diff --git a/modules/product/includes/commerce_product_ui.forms.inc b/modules/product/includes/commerce_product_ui.forms.inc
index fe6da7d..8e27fab 100644
--- a/modules/product/includes/commerce_product_ui.forms.inc
+++ b/modules/product/includes/commerce_product_ui.forms.inc
@@ -84,8 +84,7 @@ function commerce_product_ui_product_type_form($form, &$form_state, $product_typ
   }
 
   $form['actions'] = array(
-    '#type' => 'container',
-    '#attributes' => array('class' => array('form-actions')),
+    '#type' => 'actions',
     '#weight' => 40,
   );
 
diff --git a/modules/tax/includes/commerce_tax_ui.admin.inc b/modules/tax/includes/commerce_tax_ui.admin.inc
index fa9afde..9b142f1 100644
--- a/modules/tax/includes/commerce_tax_ui.admin.inc
+++ b/modules/tax/includes/commerce_tax_ui.admin.inc
@@ -198,8 +198,7 @@ function commerce_tax_ui_tax_rate_form($form, &$form_state, $tax_rate) {
   );
 
   $form['actions'] = array(
-    '#type' => 'container',
-    '#attributes' => array('class' => array('form-actions')),
+    '#type' => 'actions',
     '#weight' => 40,
   );
 
@@ -386,8 +385,7 @@ function commerce_tax_ui_tax_type_form($form, &$form_state, $tax_type) {
   );
 
   $form['actions'] = array(
-    '#type' => 'container',
-    '#attributes' => array('class' => array('form-actions')),
+    '#type' => 'actions',
     '#weight' => 40,
   );