diff --git a/composer.json b/composer.json
index 3580e82beaaa2d96e6a65f89727aea9cef6fa4d3..9b9e06839732ac304a0eeecd94d9dd73a915d58f 100644
--- a/composer.json
+++ b/composer.json
@@ -7,6 +7,7 @@
     "prefer-stable": true,
     "require": {
         "php": ">=7.3",
+        "drupal/better_exposed_filters": "^5.0@beta",
         "drupal/components": "^2.4",
         "drupal/core": "^8.9 || ^9.1",
         "drupal/ui_patterns": "^1.0",
diff --git a/modules/oe_whitelabel_helper/src/Plugin/better_exposed_filters/sort/FloatEndSortWidget.php b/modules/oe_whitelabel_helper/src/Plugin/better_exposed_filters/sort/FloatEndSortWidget.php
new file mode 100644
index 0000000000000000000000000000000000000000..1990736eb320477c65acca9e71ad55f747b06b59
--- /dev/null
+++ b/modules/oe_whitelabel_helper/src/Plugin/better_exposed_filters/sort/FloatEndSortWidget.php
@@ -0,0 +1,29 @@
+<?php
+
+declare(strict_types = 1);
+
+namespace Drupal\oe_whitelabel_helper\Plugin\better_exposed_filters\sort;
+
+use Drupal\better_exposed_filters\Plugin\better_exposed_filters\sort\DefaultWidget;
+use Drupal\Core\Form\FormStateInterface;
+
+/**
+ * OpenEuropa custom better exposed filters widget implementation.
+ *
+ * @BetterExposedFiltersSortWidget(
+ *   id = "float_end_sort",
+ *   label = @Translation("Float End Sort Better Exposed Filter"),
+ * )
+ */
+class FloatEndSortWidget extends DefaultWidget {
+
+  /**
+   * {@inheritdoc}
+   */
+  public function exposedFormAlter(array &$form, FormStateInterface $form_state) {
+    parent::exposedFormAlter($form, $form_state);
+    $form['#attributes']['class'][] = 'float-lg-end';
+    $form['#attributes']['class'][] = 'd-md-block';
+  }
+
+}
diff --git a/oe_whitelabel.theme b/oe_whitelabel.theme
index 29dbc956e07a847409747c8cef10dd04bd6f4220..87447e810ff5da233bb7b1b63d11f9af26497714 100644
--- a/oe_whitelabel.theme
+++ b/oe_whitelabel.theme
@@ -7,8 +7,6 @@
 
 declare(strict_types = 1);
 
-use Drupal\Core\Form\FormStateInterface;
-
 /**
  * Implements hook__preprocess_links__language_block().
  */
@@ -66,22 +64,3 @@ function oe_whitelabel_preprocess_links__language_block(&$variables) {
     ],
   ];
 }
-
-/**
- * Implements hook_form_alter().
- */
-function oe_whitelabel_form_alter(&$form, FormStateInterface $form_state, $form_id) {
-  if (isset($form['actions'])) {
-    $form['actions']['#attributes']['class'][] = 'mt-4';
-  }
-  if (isset($form['actions']['submit'])) {
-    $form['actions']['submit']['#attributes']['class'][] = 'me-2';
-    array_push($form['actions']['submit']['#attributes']['class'], 'btn', 'btn-primary');
-    $form['actions']['submit']['#attributes']['class'] = array_unique($form['actions']['submit']['#attributes']['class']);
-  }
-  if (isset($form['actions']['reset'])) {
-    $form['actions']['reset']['#attributes']['class'][] = 'btn';
-    $form['actions']['reset']['#attributes']['class'][] = 'btn-secondary';
-    $form['actions']['reset']['#attributes']['class'] = array_unique($form['actions']['reset']['#attributes']['class']);
-  }
-}