diff --git a/epicyon-profile.css b/epicyon-profile.css
index 00a6d3f2..c85fc16c 100644
--- a/epicyon-profile.css
+++ b/epicyon-profile.css
@@ -35,6 +35,7 @@
     --time-vertical-align: 4px;
     --button-text: #FFFFFF;
     --button-background: #999;
+    --button-background-hover: #777;
     --button-selected: #666;
     --button-highlighted: green;
     --button-fg-highlighted: #FFFFFF;
@@ -236,13 +237,8 @@ a:focus {
     transition: 0.5s;
 }
 
-.button:hover span {
-    padding-right: 25px;
-}
-
-.button:hover span:after {
-    opacity: 1;
-    right: 0;
+.button:hover {
+    background-color: var(--button-background-hover);
 }
 
 .buttonselected span {
@@ -263,13 +259,8 @@ a:focus {
     transition: 0.5s;
 }
 
-.buttonselected:hover span {
-    padding-right: 25px;
-}
-
-.buttonselected:hover span:after {
-    opacity: 1;
-    right: 0;
+.buttonselected:hover {
+    background-color: var(--button-background-hover);
 }
 
 .container {
diff --git a/theme.py b/theme.py
index 9227aa99..a4984a6f 100644
--- a/theme.py
+++ b/theme.py
@@ -294,7 +294,8 @@ def setThemeNight(baseDir: str):
         "main-bg-color-report": "#0f0d10",
         "hashtag-vertical-spacing3": "100px",
         "hashtag-vertical-spacing4": "150px",
-        "button-background": "#7961ab",
+        "button-background-hover": "#6961ab",
+        "button-background": "#a961ab",
         "button-selected": "#86579d",
         "calendar-bg-color": "#0f0d10",
         "lines-color": "#7961ab",
@@ -342,6 +343,7 @@ def setThemeStarlight(baseDir: str):
         "main-bg-color-report": "#0f0d10",
         "hashtag-vertical-spacing3": "100px",
         "hashtag-vertical-spacing4": "150px",
+        "button-background-hover": "#a9282c",
         "button-background": "#69282c",
         "button-small-background": "darkblue",
         "button-selected": "#a34046",
@@ -398,6 +400,7 @@ def setThemeHenge(baseDir: str):
         "main-bg-color-report": "#383335",
         "hashtag-vertical-spacing3": "100px",
         "hashtag-vertical-spacing4": "150px",
+        "button-background-hover": "#444",
         "button-background": "#222",
         "button-selected": "black",
         "dropdown-fg-color": "#dddddd",
@@ -441,6 +444,7 @@ def setThemeZen(baseDir: str):
         "main-link-color": "#dddddd",
         "title-color": "#dddddd",
         "main-visited-color": "#dddddd",
+        "button-background-hover": "#a63b35",
         "button-background": "#463b35",
         "button-selected": "#26201d",
         "main-bg-color-dm": "#5c4a40",
@@ -503,6 +507,7 @@ def setThemeLCD(baseDir: str):
         "main-visited-color": "#9fb42b",
         "button-selected": "black",
         "button-highlighted": "green",
+        "button-background-hover": "#a3390d",
         "button-background": "#33390d",
         "button-small-background": "#33390d",
         "button-text": "#9fb42b",
@@ -572,6 +577,7 @@ def setThemePurple(baseDir: str):
         "title-color": "white",
         "main-visited-color": "#f93bb0",
         "button-selected": "#c042a0",
+        "button-background-hover": "#af42a0",
         "button-background": "#ff42a0",
         "button-small-background": "#ff42a0",
         "button-text": "white",
@@ -619,6 +625,7 @@ def setThemeHacker(baseDir: str):
         "title-color": "#2fff2f",
         "main-visited-color": "#3c8234",
         "button-selected": "#063200",
+        "button-background-hover": "#a62200",
         "button-background": "#062200",
         "button-small-background": "#062200",
         "button-text": "#00ff00",