4 files changed, 18 insertions, 29 deletions
diff --git a/modules/user/user-rtl.css b/modules/user/user-rtl.css
index ca3d9fa87..9f8219619 100644
--- a/modules/user/user-rtl.css
+++ b/modules/user/user-rtl.css
@@ -5,7 +5,7 @@
   padding-right: 1.5em;
 }
 
-#user-admin-filter dl.multiselect dd .form-item label {
+#user-filter-form dl.multiselect dd .form-item label {
   float: right;
 }
 
diff --git a/modules/user/user.admin.inc b/modules/user/user.admin.inc
index 882cf6c5f..b84271d64 100644
--- a/modules/user/user.admin.inc
+++ b/modules/user/user.admin.inc
@@ -72,16 +72,21 @@ function user_filter_form() {
     );
   }
 
-  $form['filters']['buttons']['submit'] = array(
+  $form['filters']['actions'] = array(
+    '#type' => 'container',
+    '#id' => 'user-admin-buttons',
+    '#attributes' => array('class' => array('form-actions', 'container-inline')),
+  );
+  $form['filters']['actions']['submit'] = array(
     '#type' => 'submit',
     '#value' => (count($session) ? t('Refine') : t('Filter')),
   );
   if (count($session)) {
-    $form['filters']['buttons']['undo'] = array(
+    $form['filters']['actions']['undo'] = array(
       '#type' => 'submit',
       '#value' => t('Undo'),
     );
-    $form['filters']['buttons']['reset'] = array(
+    $form['filters']['actions']['reset'] = array(
       '#type' => 'submit',
       '#value' => t('Reset'),
     );
@@ -698,7 +703,9 @@ function user_admin_permissions($form, $form_state, $rid = NULL) {
     $form['checkboxes'][$rid] = array('#type' => 'checkboxes', '#options' => $options, '#default_value' => isset($status[$rid]) ? $status[$rid] : array());
     $form['role_names'][$rid] = array('#markup' => $name, '#tree' => TRUE);
   }
-  $form['submit'] = array('#type' => 'submit', '#value' => t('Save permissions'));
+  
+  $form['actions'] = array('#type' => 'container', '#attributes' => array('class' => array('form-actions')));
+  $form['actions']['submit'] = array('#type' => 'submit', '#value' => t('Save permissions'));
 
   $form['#attached']['js'][] = drupal_get_path('module', 'user') . '/user.permissions.js';
 
@@ -787,11 +794,12 @@ function user_admin_role() {
       '#type' => 'value',
       '#value' => $rid,
     );
-    $form['submit'] = array(
+    $form['actions'] = array('#type' => 'container', '#attributes' => array('class' => array('form-actions')));
+    $form['actions']['submit'] = array(
       '#type' => 'submit',
       '#value' => t('Save role'),
     );
-    $form['delete'] = array(
+    $form['actions']['delete'] = array(
       '#type' => 'submit',
       '#value' => t('Delete role'),
     );
@@ -876,21 +884,6 @@ function theme_user_admin_new_role($variables) {
 }
 
 /**
- * Theme user administration filter form.
- *
- * @ingroup themeable
- */
-function theme_user_filter_form($variables) {
-  $form = $variables['form'];
-
-  $output = '<div id="user-admin-filter">';
-  $output .= drupal_render($form['filters']);
-  $output .= '</div>';
-  $output .= drupal_render_children($form);
-  return $output;
-}
-
-/**
  * Theme user administration filter selector.
  *
  * @ingroup themeable
@@ -916,7 +909,7 @@ function theme_user_filters($variables) {
   $output .= '</dd>';
 
   $output .= '</dl>';
-  $output .= '<div class="container-inline" id="user-admin-buttons">' . drupal_render($form['buttons']) . '</div>';
+  $output .= drupal_render($form['actions']);
 
   return $output;
 }
diff --git a/modules/user/user.css b/modules/user/user.css
index ceb1562d1..d79e04e90 100644
--- a/modules/user/user.css
+++ b/modules/user/user.css
@@ -10,10 +10,10 @@
   white-space: normal;
 }
 /* Override the default multiselect layout in system.css. */
-#user-admin-filter dl.multiselect dd, dl.multiselect dd .form-item {
+#user-filter-form dl.multiselect dd, dl.multiselect dd .form-item {
   width: 20em; /* 6em label + 14em select */
 }
-#user-admin-filter dl.multiselect dd .form-item label {
+#user-filter-form dl.multiselect dd .form-item label {
   display: block;
   float: left; /* LTR */
   width: 6em;
diff --git a/modules/user/user.module b/modules/user/user.module
index cf1db1f1e..e9e3849fa 100644
--- a/modules/user/user.module
+++ b/modules/user/user.module
@@ -106,10 +106,6 @@ function user_theme() {
       'render element' => 'form',
       'file' => 'user.admin.inc',
     ),
-    'user_filter_form' => array(
-      'render element' => 'form',
-      'file' => 'user.admin.inc',
-    ),
     'user_filters' => array(
       'render element' => 'form',
       'file' => 'user.admin.inc',