diff --git a/src/Column/Type/MoneyColumnType.php b/src/Column/Type/MoneyColumnType.php
index df32551c..26f3d6a1 100755
--- a/src/Column/Type/MoneyColumnType.php
+++ b/src/Column/Type/MoneyColumnType.php
@@ -53,17 +53,28 @@ public function configureOptions(OptionsResolver $resolver): void
             ->allowedTypes('bool')
         ;
 
-        $resolver->define('intl_formatter_options')
-            ->default(function (OptionsResolver $resolver) {
-                $resolver
-                    ->setDefaults([
-                        'attrs' => [],
-                        'style' => 'decimal',
-                    ])
-                    ->setAllowedTypes('attrs', 'array')
-                    ->setAllowedTypes('style', 'string')
-                ;
-            })
-        ;
+        if (method_exists($resolver, 'setOptions')) {
+            $resolver->setOptions('intl_formatter_options', function (OptionsResolver $resolver): void {
+                $resolver->setDefaults([
+                    'attrs' => [],
+                    'style' => 'decimal',
+                ]);
+                $resolver->setAllowedTypes('attrs', 'array');
+                $resolver->setAllowedTypes('style', 'string');
+            });
+        } else { // BC layer for Symfony <7.3
+            $resolver->define('intl_formatter_options')
+                ->default(function (OptionsResolver $resolver) {
+                    $resolver
+                        ->setDefaults([
+                            'attrs' => [],
+                            'style' => 'decimal',
+                        ])
+                        ->setAllowedTypes('attrs', 'array')
+                        ->setAllowedTypes('style', 'string')
+                    ;
+                })
+            ;
+        }
     }
 }
diff --git a/src/Column/Type/NumberColumnType.php b/src/Column/Type/NumberColumnType.php
index 55fbcea6..a602451c 100755
--- a/src/Column/Type/NumberColumnType.php
+++ b/src/Column/Type/NumberColumnType.php
@@ -31,17 +31,28 @@ public function configureOptions(OptionsResolver $resolver): void
             ->allowedTypes('bool')
         ;
 
-        $resolver->define('intl_formatter_options')
-            ->default(function (OptionsResolver $resolver) {
-                $resolver
-                    ->setDefaults([
-                        'attrs' => [],
-                        'style' => 'decimal',
-                    ])
-                    ->setAllowedTypes('attrs', 'array')
-                    ->setAllowedTypes('style', 'string')
-                ;
-            })
-        ;
+        if (method_exists($resolver, 'setOptions')) {
+            $resolver->setOptions('intl_formatter_options', function (OptionsResolver $resolver): void {
+                $resolver->setDefaults([
+                    'attrs' => [],
+                    'style' => 'decimal',
+                ]);
+                $resolver->setAllowedTypes('attrs', 'array');
+                $resolver->setAllowedTypes('style', 'string');
+            });
+        } else { // BC layer for Symfony <7.3
+            $resolver->define('intl_formatter_options')
+                ->default(function (OptionsResolver $resolver) {
+                    $resolver
+                        ->setDefaults([
+                            'attrs' => [],
+                            'style' => 'decimal',
+                        ])
+                        ->setAllowedTypes('attrs', 'array')
+                        ->setAllowedTypes('style', 'string')
+                    ;
+                })
+            ;
+        }
     }
 }
diff --git a/src/Resources/views/themes/bootstrap_5.html.twig b/src/Resources/views/themes/bootstrap_5.html.twig
index 4734bf7b..0edded17 100755
--- a/src/Resources/views/themes/bootstrap_5.html.twig
+++ b/src/Resources/views/themes/bootstrap_5.html.twig
@@ -887,7 +887,7 @@
         'outline-dark': 'btn-outline-dark',
     }|merge(variants ?? {})|filter(e => e is not same as false) -%}
 
-    {% set base_classes = base_classes ?? 'btn d-inline-flex align-items-center gap-2' ~ (with_caret ? ' dropdown-toggle') %}
+    {% set base_classes = (base_classes ?? 'btn d-inline-flex align-items-center gap-2') ~ (with_caret ? ' dropdown-toggle') %}
     {% set variant_classes = variant_classes ?? variants[variant ?? default_variant ?? 'primary'] %}
 
     {% set attr = {