diff --git a/public/typo3conf/ext/ep_theme/Resources/Private/Assets/scss/components/_buttons.scss b/public/typo3conf/ext/ep_theme/Resources/Private/Assets/scss/components/_buttons.scss
index 17e7b6f8..6640c231 100644
--- a/public/typo3conf/ext/ep_theme/Resources/Private/Assets/scss/components/_buttons.scss
+++ b/public/typo3conf/ext/ep_theme/Resources/Private/Assets/scss/components/_buttons.scss
@@ -42,6 +42,18 @@
         @apply suz:bg-suz-primary;
         @apply uch:bg-uch-primary;
         @apply ser:bg-ser-secondary;
+        @apply hover:bg-ep-primary-dark hover:text-white;
+        @apply sbw:hover:bg-sbw-primary-dark;
+        @apply snz:hover:bg-snz-primary-dark;
+        @apply suz:hover:bg-suz-primary-dark;
+        @apply uch:hover:bg-uch-primary-dark;
+        @apply ser:hover:bg-ser-primary;
+        @apply peer-hover:bg-ep-primary-dark peer-hover:text-white;
+        @apply sbw:peer-hover:bg-sbw-primary-dark;
+        @apply snz:peer-hover:bg-snz-primary-dark;
+        @apply suz:peer-hover:bg-suz-primary-dark;
+        @apply uch:peer-hover:bg-uch-primary-dark;
+        @apply ser:peer-hover:bg-ser-primary;
     }
 
     &--muted {
diff --git a/public/typo3conf/ext/ep_theme/Resources/Private/Partials/Disrupter/Large.html b/public/typo3conf/ext/ep_theme/Resources/Private/Partials/Disrupter/Large.html
index aed2eb21..18080335 100644
--- a/public/typo3conf/ext/ep_theme/Resources/Private/Partials/Disrupter/Large.html
+++ b/public/typo3conf/ext/ep_theme/Resources/Private/Partials/Disrupter/Large.html
@@ -45,7 +45,7 @@
                     <div class="grid grid-cols-1 sm:grid-cols-2 gap-4 lg:gap-8">
                         <f:for each="{data.flexForm.buttons}" as="button">
                             <f:link.typolink parameter="{button.container.link}"
-                                             class="button bg-button shadow-lg">
+                                             class="button bg-button--secondary shadow-lg">
                                 {button.container.label}
                             </f:link.typolink>
                         </f:for>
diff --git a/public/typo3conf/ext/ep_theme/Resources/Private/Partials/Disrupter/Small.html b/public/typo3conf/ext/ep_theme/Resources/Private/Partials/Disrupter/Small.html
index f6302e07..583a6e44 100644
--- a/public/typo3conf/ext/ep_theme/Resources/Private/Partials/Disrupter/Small.html
+++ b/public/typo3conf/ext/ep_theme/Resources/Private/Partials/Disrupter/Small.html
@@ -25,7 +25,7 @@
                     <div class="flex flex-col space-y-4 md:flex-row md:items-center md:space-y-0 md:space-x-4">
                         <f:for each="{data.flexForm.buttons}" as="button" iteration="iteration">
                             <f:if condition="{iteration.cycle} <= 3">
-                                <f:link.typolink parameter="{button.container.link}" class="button bg-button shadow-lg">
+                                <f:link.typolink parameter="{button.container.link}" class="button bg-button--secondary shadow-lg">
                                     {button.container.label}
                                 </f:link.typolink>
                             </f:if>
diff --git a/public/typo3conf/ext/ep_theme/Resources/Private/Partials/Disturber/Large.html b/public/typo3conf/ext/ep_theme/Resources/Private/Partials/Disturber/Large.html
index f2ce4681..7071aff3 100644
--- a/public/typo3conf/ext/ep_theme/Resources/Private/Partials/Disturber/Large.html
+++ b/public/typo3conf/ext/ep_theme/Resources/Private/Partials/Disturber/Large.html
@@ -46,7 +46,7 @@
                     <div class="grid grid-cols-1 sm:grid-cols-2 gap-4 lg:gap-8">
                         <f:for each="{data.flexForm.buttons}" as="button">
                             <f:link.typolink parameter="{button.container.link}"
-                                             class="button bg-button shadow-lg">
+                                             class="button bg-button--secondary shadow-lg">
                                 {button.container.label}
                             </f:link.typolink>
                         </f:for>
diff --git a/public/typo3conf/ext/ep_theme/Resources/Private/Partials/Disturber/LastChance.html b/public/typo3conf/ext/ep_theme/Resources/Private/Partials/Disturber/LastChance.html
index 4cce0653..c19c4924 100644
--- a/public/typo3conf/ext/ep_theme/Resources/Private/Partials/Disturber/LastChance.html
+++ b/public/typo3conf/ext/ep_theme/Resources/Private/Partials/Disturber/LastChance.html
@@ -12,7 +12,7 @@
         </div>
         <div>
             {data.flexForm.buttons -> v:iterator.first() -> v:variable.set(name: 'button')}
-            <a href="{f:uri.typolink(parameter: button.container.link)}" class="btn btn-info">
+            <a href="{f:uri.typolink(parameter: button.container.link)}" class="button bg-button--secondary">
                 {button.container.label -> f:format.raw()}
             </a>
         </div>
diff --git a/public/typo3conf/ext/ep_theme/Resources/Private/Partials/Disturber/Small.html b/public/typo3conf/ext/ep_theme/Resources/Private/Partials/Disturber/Small.html
index 51ec58e6..2ee73161 100644
--- a/public/typo3conf/ext/ep_theme/Resources/Private/Partials/Disturber/Small.html
+++ b/public/typo3conf/ext/ep_theme/Resources/Private/Partials/Disturber/Small.html
@@ -25,7 +25,7 @@
                     <div class="flex flex-col space-y-4 md:flex-row md:items-center md:space-y-0 md:space-x-4">
                         <f:for each="{data.flexForm.buttons}" as="button" iteration="iteration">
                             <f:if condition="{iteration.cycle} <= 3">
-                                <f:link.typolink parameter="{button.container.link}" class="button bg-button shadow-lg">
+                                <f:link.typolink parameter="{button.container.link}" class="button bg-button--secondary shadow-lg">
                                     {button.container.label}
                                 </f:link.typolink>
                             </f:if>
diff --git a/public/typo3conf/ext/ep_theme/Resources/Private/Partials/HeaderSlider.html b/public/typo3conf/ext/ep_theme/Resources/Private/Partials/HeaderSlider.html
index f2815133..15da6624 100644
--- a/public/typo3conf/ext/ep_theme/Resources/Private/Partials/HeaderSlider.html
+++ b/public/typo3conf/ext/ep_theme/Resources/Private/Partials/HeaderSlider.html
@@ -35,7 +35,7 @@
                                         <f:if condition="{slide.button}">
                                             <f:link.typolink parameter="{slide.page_uid}"
                                                              additionalAttributes="{'tabindex': '-1'}"
-                                                             class="button bg-button inline-block">
+                                                             class="button bg-button--secondary inline-block">
                                                 {slide.button}
                                             </f:link.typolink>
                                         </f:if>