diff --git a/.config/quickshell/modules/bar/CircleUtilButton.qml b/.config/quickshell/modules/bar/CircleUtilButton.qml
index c4673e743..3027c130c 100644
--- a/.config/quickshell/modules/bar/CircleUtilButton.qml
+++ b/.config/quickshell/modules/bar/CircleUtilButton.qml
@@ -7,25 +7,14 @@ import QtQuick.Layouts
 import Quickshell
 import Quickshell.Io
 
-Button {
+RippleButton {
     id: button
 
     required default property Item content
     property bool extraActiveCondition: false
 
-    PointingHandInteraction{}
-
     implicitHeight: Math.max(content.implicitHeight, 26, content.implicitHeight)
-    implicitWidth: Math.max(content.implicitHeight, 26, content.implicitWidth)
+    implicitWidth: implicitHeight
     contentItem: content
 
-    background: Rectangle {
-        anchors.fill: parent
-        radius: Appearance.rounding.full
-        color: (button.down || extraActiveCondition) ? Appearance.colors.colLayer1Active : 
-            (button.hovered ? Appearance.colors.colLayer1Hover : 
-            ColorUtils.transparentize(Appearance.colors.colLayer1, 1))
-
-    }
-
 }
diff --git a/.config/quickshell/modules/cheatsheet/Cheatsheet.qml b/.config/quickshell/modules/cheatsheet/Cheatsheet.qml
index 587e47150..f7a69266e 100644
--- a/.config/quickshell/modules/cheatsheet/Cheatsheet.qml
+++ b/.config/quickshell/modules/cheatsheet/Cheatsheet.qml
@@ -81,11 +81,12 @@ Scope { // Scope
                     }
                 }
 
-                Button { // Close button
+                RippleButton { // Close button
                     id: closeButton
                     focus: cheatsheetRoot.visible
                     implicitWidth: 40
                     implicitHeight: 40
+                    buttonRadius: Appearance.rounding.full
                     anchors {
                         top: parent.top
                         right: parent.right
@@ -93,28 +94,15 @@ Scope { // Scope
                         rightMargin: 20
                     }
 
-                    PointingHandInteraction {}
                     onClicked: {
                         cheatsheetRoot.hide()
                     }
 
-                    background: null
-                    contentItem: Rectangle {
-                        anchors.fill: parent
-                        radius: Appearance.rounding.full
-                        color: closeButton.pressed ? Appearance.colors.colLayer0Active :
-                            closeButton.hovered ? Appearance.colors.colLayer0Hover :
-                            ColorUtils.transparentize(Appearance.colors.colLayer0, 1)
-                        
-                        Behavior on color {
-                            animation: Appearance.animation.elementMoveFast.colorAnimation.createObject(this)
-                        }
-
-                        MaterialSymbol {
-                            anchors.centerIn: parent
-                            font.pixelSize: Appearance.font.pixelSize.title
-                            text: "close"
-                        }
+                    contentItem: MaterialSymbol {
+                        anchors.centerIn: parent
+                        horizontalAlignment: Text.AlignHCenter
+                        font.pixelSize: Appearance.font.pixelSize.title
+                        text: "close"
                     }
                 }
 
diff --git a/.config/quickshell/modules/common/Appearance.qml b/.config/quickshell/modules/common/Appearance.qml
index 9c5a37557..010818364 100644
--- a/.config/quickshell/modules/common/Appearance.qml
+++ b/.config/quickshell/modules/common/Appearance.qml
@@ -115,7 +115,7 @@ Singleton {
         property color colLayer2Disabled: ColorUtils.mix(colLayer2, m3colors.m3background, 0.8);
         property color colLayer3Hover: ColorUtils.mix(colLayer3, colOnLayer3, 0.90);
         property color colLayer3Active: ColorUtils.mix(colLayer3, colOnLayer3, 0.80);
-        property color colPrimaryHover: ColorUtils.mix(m3colors.m3primary, colLayer1Hover, 0.85)
+        property color colPrimaryHover: ColorUtils.mix(m3colors.m3primary, colLayer1Hover, 0.87)
         property color colPrimaryActive: ColorUtils.mix(m3colors.m3primary, colLayer1Active, 0.7)
         property color colPrimaryContainerHover: ColorUtils.mix(m3colors.m3primaryContainer, colLayer1Hover, 0.7)
         property color colPrimaryContainerActive: ColorUtils.mix(m3colors.m3primaryContainer, colLayer1Active, 0.6)
@@ -137,6 +137,7 @@ Singleton {
         property int small: 12
         property int normal: 17
         property int large: 23
+        property int verylarge: 30
         property int full: 9999
         property int screenRounding: large
         property int windowRounding: 18
@@ -147,7 +148,7 @@ Singleton {
             property string main: "Rubik"
             property string title: "Gabarito"
             property string iconMaterial: "Material Symbols Rounded"
-            property string iconNerd: "JetBrains Mono NF"
+            property string iconNerd: "SpaceMono NF"
             property string monospace: "JetBrains Mono NF"
             property string reading: "Readex Pro"
         }
@@ -225,11 +226,16 @@ Singleton {
             property int type: Easing.BezierSpline
             property list<real> bezierCurve: animationCurves.standardDecel
             property int velocity: 850
-            property Component colorAnimation: Component {ColorAnimation {
+            property Component colorAnimation: Component { ColorAnimation {
                 duration: root.animation.elementMoveFast.duration
                 easing.type: root.animation.elementMoveFast.type
                 easing.bezierCurve: root.animation.elementMoveFast.bezierCurve
             }}
+            property Component numberAnimation: Component { NumberAnimation {
+                    duration: root.animation.elementMoveFast.duration
+                    easing.type: root.animation.elementMoveFast.type
+                    easing.bezierCurve: root.animation.elementMoveFast.bezierCurve
+            }}
         }
         property QtObject scroll: QtObject {
             property int duration: 400
diff --git a/.config/quickshell/modules/common/widgets/DialogButton.qml b/.config/quickshell/modules/common/widgets/DialogButton.qml
index c3ae39397..062fa3dba 100644
--- a/.config/quickshell/modules/common/widgets/DialogButton.qml
+++ b/.config/quickshell/modules/common/widgets/DialogButton.qml
@@ -6,28 +6,13 @@ import QtQuick.Layouts
 import Quickshell
 import Quickshell.Io
 
-Button {
+RippleButton {
     id: button
 
     property string buttonText
     implicitHeight: 30
     implicitWidth: buttonTextWidget.implicitWidth + 15 * 2
-
-    PointingHandInteraction {}
-
-    background: Rectangle {
-        anchors.fill: parent
-        radius: Appearance.rounding.full
-        color: (button.down && button.enabled) ? Appearance.colors.colLayer1Active : 
-            ((button.hovered && button.enabled) ? Appearance.colors.colLayer1Hover : 
-            ColorUtils.transparentize(Appearance.m3colors.m3surfaceContainerHigh, 1))
-
-        Behavior on color {
-            animation: Appearance.animation.elementMoveFast.colorAnimation.createObject(this)
-
-        }
-
-    }
+    buttonRadius: Appearance.rounding.full
 
     contentItem: StyledText {
         id: buttonTextWidget
diff --git a/.config/quickshell/modules/common/widgets/MenuButton.qml b/.config/quickshell/modules/common/widgets/MenuButton.qml
index f44c4c099..41bd762ef 100644
--- a/.config/quickshell/modules/common/widgets/MenuButton.qml
+++ b/.config/quickshell/modules/common/widgets/MenuButton.qml
@@ -6,33 +6,19 @@ import QtQuick.Layouts
 import Quickshell
 import Quickshell.Io
 
-Button {
+RippleButton {
     id: button
 
-    property string buttonText
+    buttonRadius: 0
     implicitHeight: 36
     implicitWidth: buttonTextWidget.implicitWidth + 14 * 2
 
-    PointingHandInteraction {}
-
-    background: Rectangle {
-        anchors.fill: parent
-        color: (button.down && button.enabled) ? ColorUtils.transparentize(Appearance.m3colors.m3onSurface, 0.84) : 
-            ((button.hovered && button.enabled) ? ColorUtils.transparentize(Appearance.m3colors.m3onSurface, 0.92) : 
-            ColorUtils.transparentize(Appearance.m3colors.m3onSurface, 1))
-
-        Behavior on color {
-            animation: Appearance.animation.elementMoveFast.colorAnimation.createObject(this)
-        }
-
-    }
-
     contentItem: StyledText {
         id: buttonTextWidget
         anchors.fill: parent
         anchors.leftMargin: 14
         anchors.rightMargin: 14
-        text: buttonText
+        text: button.buttonText
         horizontalAlignment: Text.AlignLeft
         font.pixelSize: Appearance.font.pixelSize.small
         color: button.enabled ? Appearance.m3colors.m3onSurface : Appearance.m3colors.m3outline
diff --git a/.config/quickshell/modules/common/widgets/NotificationActionButton.qml b/.config/quickshell/modules/common/widgets/NotificationActionButton.qml
index c0c1b8629..370814f91 100644
--- a/.config/quickshell/modules/common/widgets/NotificationActionButton.qml
+++ b/.config/quickshell/modules/common/widgets/NotificationActionButton.qml
@@ -6,7 +6,7 @@ import QtQuick.Layouts
 import Quickshell
 import Quickshell.Services.Notifications
 
-Button {
+RippleButton {
     id: button
     property string buttonText
     property string urgency
@@ -14,20 +14,10 @@ Button {
     implicitHeight: 30
     leftPadding: 15
     rightPadding: 15
-
-    // PointingHandInteraction {}
-
-    background: Rectangle {
-        radius: Appearance.rounding.small
-        color: (urgency == NotificationUrgency.Critical) ? 
-        (button.down ? Appearance.colors.colSecondaryContainerActive : 
-            button.hovered ? Appearance.colors.colSecondaryContainerHover : 
-            Appearance.m3colors.m3secondaryContainer) : 
-        (button.down ? Appearance.colors.colSurfaceContainerHighestActive : 
-            button.hovered ? Appearance.colors.colSurfaceContainerHighestHover :
-            Appearance.m3colors.m3surfaceContainerHighest)
-
-    }
+    buttonRadius: Appearance.rounding.small
+    colBackground: (urgency == NotificationUrgency.Critical) ? Appearance.m3colors.m3secondaryContainer : Appearance.m3colors.m3surfaceContainerHighest
+    colBackgroundHover: (urgency == NotificationUrgency.Critical) ? Appearance.colors.colSecondaryContainerHover : Appearance.colors.colSurfaceContainerHighestHover
+    colRipple: (urgency == NotificationUrgency.Critical) ? Appearance.colors.colSecondaryContainerActive : Appearance.colors.colSurfaceContainerHighestActive
 
     contentItem: StyledText {
         horizontalAlignment: Text.AlignHCenter
diff --git a/.config/quickshell/modules/common/widgets/NotificationWidget.qml b/.config/quickshell/modules/common/widgets/NotificationWidget.qml
index 5a1cb0f51..14af360f9 100644
--- a/.config/quickshell/modules/common/widgets/NotificationWidget.qml
+++ b/.config/quickshell/modules/common/widgets/NotificationWidget.qml
@@ -389,27 +389,20 @@ Item {
                                 }
                             }
 
-                            Button { // Expand button
+                            RippleButton { // Expand button
                                 Layout.alignment: Qt.AlignTop
                                 id: expandButton
                                 implicitWidth: 22
                                 implicitHeight: 22
 
-                                PointingHandInteraction{}
+                                buttonRadius: Appearance.rounding.full
+                                colBackgroundHover: Appearance.colors.colLayer2Hover
+                                colRipple: Appearance.colors.colLayer2Active
+                                
                                 onClicked: {
                                     root.toggleExpanded()
                                 }
 
-                                background: Rectangle {
-                                    anchors.fill: parent
-                                    radius: Appearance.rounding.full
-                                    color: (expandButton.down) ? Appearance.colors.colLayer2Active : (expandButton.hovered ? Appearance.colors.colLayer2Hover : ColorUtils.transparentize(Appearance.colors.colLayer2, 1))
-
-                                    Behavior on color {
-                                        animation: Appearance.animation.elementMoveFast.colorAnimation.createObject(this)
-                                    }
-                                }
-
                                 contentItem: MaterialSymbol {
                                     anchors.centerIn: parent
                                     text: "keyboard_arrow_down"
diff --git a/.config/quickshell/modules/common/widgets/RippleButton.qml b/.config/quickshell/modules/common/widgets/RippleButton.qml
new file mode 100644
index 000000000..d800c662d
--- /dev/null
+++ b/.config/quickshell/modules/common/widgets/RippleButton.qml
@@ -0,0 +1,141 @@
+import "root:/modules/common"
+import "root:/modules/common/widgets"
+import "root:/modules/common/functions/color_utils.js" as ColorUtils
+import Qt5Compat.GraphicalEffects
+import QtQuick
+import QtQuick.Controls
+import QtQuick.Layouts
+import Quickshell.Io
+import Quickshell.Widgets
+
+Button {
+    id: root
+    property bool toggled
+    property string buttonText
+    property real buttonRadius: Appearance?.rounding?.small ?? 4
+    property int rippleDuration: 1200
+
+    property color colBackground: ColorUtils.transparentize(Appearance.colors.colLayer1Hover, 1)
+    property color colBackgroundHover: Appearance.colors.colLayer1Hover
+    property color colBackgroundToggled: Appearance.m3colors.m3primary
+    property color colBackgroundToggledHover: Appearance.colors.colPrimaryHover
+    property color colRipple: Appearance.colors.colLayer1Active
+    property color colRippleToggled: Appearance.colors.colPrimaryActive
+
+    property color buttonColor: root.enabled ? (root.toggled ? 
+        (root.hovered ? colBackgroundToggledHover : 
+            colBackgroundToggled) :
+        (root.hovered ? colBackgroundHover : 
+            colBackground)) : colBackground
+    property color rippleColor: root.toggled ? colRippleToggled : colRipple
+
+    component RippleAnim: NumberAnimation {
+        duration: rippleDuration
+        easing.type: Appearance.animation.elementMoveEnter.type
+        easing.bezierCurve: Appearance.animationCurves.standardDecel
+    }
+
+    MouseArea {
+        anchors.fill: parent
+        cursorShape: Qt.PointingHandCursor
+        onPressed: (event) => { 
+            const {x,y} = event
+            const stateY = buttonBackground.y;
+            rippleAnim.x = x;
+            rippleAnim.y = y - stateY;
+
+            const dist = (ox,oy) => ox*ox + oy*oy
+            const stateEndY = stateY + buttonBackground.height
+            rippleAnim.radius = Math.sqrt(Math.max(dist(0, stateY), dist(0, stateEndY), dist(width, stateY), dist(width, stateEndY)))
+
+            rippleFadeAnim.complete();
+            rippleAnim.restart();
+        }
+        onReleased: (event) => {
+            root.click() // Because the MouseArea already consumed the event
+            rippleFadeAnim.restart();
+        }
+        onCanceled: (event) => {
+            rippleFadeAnim.restart();
+        }
+    }
+
+    RippleAnim {
+        id: rippleFadeAnim
+        target: ripple
+        property: "opacity"
+        to: 0
+    }
+
+    SequentialAnimation {
+        id: rippleAnim
+
+        property real x
+        property real y
+        property real radius
+
+        PropertyAction {
+            target: ripple
+            property: "x"
+            value: rippleAnim.x
+        }
+        PropertyAction {
+            target: ripple
+            property: "y"
+            value: rippleAnim.y
+        }
+        PropertyAction {
+            target: ripple
+            property: "opacity"
+            value: 1
+        }
+        ParallelAnimation {
+            RippleAnim {
+                target: ripple
+                properties: "implicitWidth,implicitHeight"
+                from: 0
+                to: rippleAnim.radius * 2
+            }
+        }
+    }
+
+    background: Rectangle {
+        id: buttonBackground
+        radius: root.buttonRadius
+        implicitHeight: 50
+
+        color: root.buttonColor
+        Behavior on color {
+            animation: Appearance.animation.elementMoveFast.colorAnimation.createObject(this)
+        }
+
+        layer.enabled: true
+        layer.effect: OpacityMask {
+            maskSource: Rectangle {
+                width: buttonBackground.width
+                height: buttonBackground.height
+                radius: buttonBackground.radius
+            }
+        }
+
+        Rectangle {
+            id: ripple
+
+            radius: Appearance.rounding.full
+            opacity: 0
+            color: root.rippleColor
+            Behavior on color {
+                animation: Appearance.animation.elementMoveFast.colorAnimation.createObject(this)
+            }
+
+            transform: Translate {
+                x: -ripple.width / 2
+                y: -ripple.height / 2
+            }
+        }
+    }
+
+    contentItem: StyledText {
+        text: root.buttonText
+    }
+}
\ No newline at end of file
diff --git a/.config/quickshell/modules/mediaControls/PlayerControl.qml b/.config/quickshell/modules/mediaControls/PlayerControl.qml
index 7217e0b9f..34a0cf414 100644
--- a/.config/quickshell/modules/mediaControls/PlayerControl.qml
+++ b/.config/quickshell/modules/mediaControls/PlayerControl.qml
@@ -25,24 +25,15 @@ Item { // Player instance
     implicitWidth: widgetWidth
     implicitHeight: widgetHeight
 
-    component TrackChangeButton: Button {
+    component TrackChangeButton: RippleButton {
         id: playPauseButton
         implicitWidth: 24
         implicitHeight: 24
 
         property var iconName
-        PointingHandInteraction {}
-
-        background: Rectangle {
-            color: playPauseButton.pressed ? blendedColors.colSecondaryContainerActive : 
-                playPauseButton.hovered ? blendedColors.colSecondaryContainerHover : 
-                ColorUtils.transparentize(blendedColors.colSecondaryContainer, 1)
-            radius: Appearance.rounding.full
-
-            Behavior on color {
-                animation: Appearance.animation.elementMoveFast.colorAnimation.createObject(this)
-            }
-        }
+        colBackground: ColorUtils.transparentize(blendedColors.colSecondaryContainer, 1)
+        colBackgroundHover: blendedColors.colSecondaryContainerHover
+        colRipple: blendedColors.colSecondaryContainerActive
 
         contentItem: MaterialSymbol {
             iconSize: Appearance.font.pixelSize.huge
@@ -98,7 +89,7 @@ Item { // Player instance
         property color colPrimaryActive: ColorUtils.mix(ColorUtils.adaptToAccent(Appearance.colors.colPrimaryActive, artDominantColor), artDominantColor, 0.3)
         property color colSecondaryContainer: ColorUtils.mix(Appearance.m3colors.m3secondaryContainer, artDominantColor, 0.3)
         property color colSecondaryContainerHover: ColorUtils.mix(Appearance.colors.colSecondaryContainerHover, artDominantColor, 0.3)
-        property color colSecondaryContainerActive: ColorUtils.mix(Appearance.colors.colSecondaryContainerActive, artDominantColor, 0.3)
+        property color colSecondaryContainerActive: ColorUtils.mix(Appearance.colors.colSecondaryContainerActive, artDominantColor, 0.5)
         property color colOnPrimary: ColorUtils.mix(ColorUtils.adaptToAccent(Appearance.m3colors.m3onPrimary, artDominantColor), artDominantColor, 0.5)
         property color colOnSecondaryContainer: ColorUtils.mix(Appearance.m3colors.m3onSecondaryContainer, artDominantColor, 0.2)
 
@@ -247,7 +238,7 @@ Item { // Player instance
                         }
                     }
 
-                    Button {
+                    RippleButton {
                         id: playPauseButton
                         anchors.right: parent.right
                         anchors.bottom: sliderRow.top
@@ -256,22 +247,10 @@ Item { // Player instance
                         implicitHeight: 44
                         onClicked: playerController.player.togglePlaying();
 
-                        PointingHandInteraction {}
-
-                        background: Rectangle {
-                            color: playerController.player?.isPlaying ? 
-                                (playPauseButton.pressed ? blendedColors.colPrimaryActive : 
-                                    playPauseButton.hovered ? blendedColors.colPrimaryHover : 
-                                    blendedColors.colPrimary) : 
-                                (playPauseButton.pressed ? blendedColors.colSecondaryContainerActive : 
-                                    playPauseButton.hovered ? blendedColors.colSecondaryContainerHover : 
-                                    blendedColors.colSecondaryContainer)
-                            radius: Appearance.rounding.full
-
-                            Behavior on color {
-                                animation: Appearance.animation.elementMoveFast.colorAnimation.createObject(this)
-                            }
-                        }
+                        buttonRadius: Appearance.rounding.full
+                        colBackground: playerController.player?.isPlaying ? blendedColors.colPrimary : blendedColors.colSecondaryContainer
+                        colBackgroundHover: playerController.player?.isPlaying ? blendedColors.colPrimaryHover : blendedColors.colSecondaryContainerHover
+                        colRipple: playerController.player?.isPlaying ? blendedColors.colPrimaryActive : blendedColors.colSecondaryContainerActive
 
                         contentItem: MaterialSymbol {
                             iconSize: Appearance.font.pixelSize.huge
diff --git a/.config/quickshell/modules/overview/SearchItem.qml b/.config/quickshell/modules/overview/SearchItem.qml
index 7643af80c..95e4c744f 100644
--- a/.config/quickshell/modules/overview/SearchItem.qml
+++ b/.config/quickshell/modules/overview/SearchItem.qml
@@ -11,7 +11,7 @@ import Quickshell.Io
 import Quickshell.Widgets
 import Quickshell.Hyprland
 
-Button {
+RippleButton {
     id: root
     property var entry
     property bool entryShown: entry?.shown ?? true
@@ -33,6 +33,18 @@ Button {
     anchors.right: parent?.right
     implicitHeight: rowLayout.implicitHeight + root.buttonVerticalPadding * 2
     implicitWidth: rowLayout.implicitWidth + root.buttonHorizontalPadding * 2
+    buttonRadius: Appearance.rounding.normal
+    colBackground: (root.down || root.keyboardDown) ? Appearance.colors.colLayer1Active : 
+        ((root.hovered || root.focus) ? Appearance.colors.colLayer1Hover : 
+        ColorUtils.transparentize(Appearance.m3colors.m3surfaceContainerHigh, 1))
+    colBackgroundHover: Appearance.colors.colLayer1Hover
+    colRipple: Appearance.colors.colLayer1Active
+
+    background {
+        anchors.fill: root
+        anchors.leftMargin: root.horizontalMargin
+        anchors.rightMargin: root.horizontalMargin
+    }
 
     PointingHandInteraction {}
     onClicked: {
@@ -53,16 +65,6 @@ Button {
         }
     }
 
-    background: Rectangle {
-        anchors.fill: parent
-        anchors.leftMargin: root.horizontalMargin
-        anchors.rightMargin: root.horizontalMargin
-        radius: Appearance.rounding.normal
-        color: (root.down || root.keyboardDown) ? Appearance.colors.colLayer1Active : 
-            ((root.hovered || root.focus) ? Appearance.colors.colLayer1Hover : 
-            ColorUtils.transparentize(Appearance.m3colors.m3surfaceContainerHigh, 1))
-    }
-
     RowLayout {
         id: rowLayout
         spacing: 10
diff --git a/.config/quickshell/modules/session/Session.qml b/.config/quickshell/modules/session/Session.qml
index 6bda4fe04..9dc8300bd 100644
--- a/.config/quickshell/modules/session/Session.qml
+++ b/.config/quickshell/modules/session/Session.qml
@@ -82,8 +82,11 @@ Scope {
                     }
                 }
 
-                RowLayout { // First row of buttons
-                    spacing: 15
+                GridLayout {
+                    columns: 4
+                    columnSpacing: 15
+                    rowSpacing: 15
+
                     SessionActionButton {
                         id: sessionLock
                         focus: sessionRoot.visible
@@ -123,10 +126,7 @@ Scope {
                         KeyNavigation.left: sessionLogout
                         KeyNavigation.down: sessionFirmwareReboot
                     }
-                }
 
-                RowLayout { // Second row of buttons
-                    spacing: 15
                     SessionActionButton {
                         id: sessionHibernate
                         buttonIcon: "downloading"
diff --git a/.config/quickshell/modules/session/SessionActionButton.qml b/.config/quickshell/modules/session/SessionActionButton.qml
index 1d32018a0..a1389aef5 100644
--- a/.config/quickshell/modules/session/SessionActionButton.qml
+++ b/.config/quickshell/modules/session/SessionActionButton.qml
@@ -1,22 +1,30 @@
 import "root:/modules/common"
 import "root:/modules/common/widgets/"
+import "root:/modules/common/functions/color_utils.js" as ColorUtils
 import QtQuick
 import QtQuick.Controls
 import QtQuick.Layouts
 import Quickshell
 import Quickshell.Io
 
-Button {
+RippleButton {
     id: button
 
     property string buttonIcon
     property string buttonText
     property bool keyboardDown: false
 
-    implicitHeight: 120
-    implicitWidth: 120
+    buttonRadius: button.focus ? Appearance.rounding.full : Appearance.rounding.verylarge
+    colBackground: button.keyboardDown ? Appearance.colors.colSecondaryContainerActive : 
+        button.focus ? Appearance.colors.colSecondaryContainerHover : 
+        Appearance.m3colors.m3secondaryContainer
+    colBackgroundHover: Appearance.colors.colSecondaryContainerHover
+    colRipple: Appearance.colors.colSecondaryContainerActive
+
+    Layout.alignment: Qt.AlignHCenter | Qt.AlignVCenter
+    background.implicitHeight: 120
+    background.implicitWidth: 120
 
-    PointingHandInteraction {}
     Keys.onPressed: (event) => {
         if (event.key === Qt.Key_Return || event.key === Qt.Key_Enter) {
             keyboardDown = true
@@ -31,21 +39,10 @@ Button {
         }
     }
 
-    background: Rectangle {
-        anchors.fill: parent
-        radius: Appearance.rounding.full
-        color: (button.down || button.keyboardDown) ? Appearance.colors.colLayer2Active : ((button.hovered || button.focus) ? Appearance.colors.colLayer2Hover : Appearance.colors.colLayer2)
-
-        Behavior on color {
-            animation: Appearance.animation.elementMove.colorAnimation.createObject(this)
-        }
-
-    }
-
     contentItem: MaterialSymbol {
         id: icon
         anchors.fill: parent
-        color: Appearance.colors.colOnLayer2
+        color: Appearance.colors.colOnLayer0
         horizontalAlignment: Text.AlignHCenter
         iconSize: 40
         text: buttonIcon
diff --git a/.config/quickshell/modules/sidebarLeft/AiChat.qml b/.config/quickshell/modules/sidebarLeft/AiChat.qml
index 37fa876ed..6e613d1fb 100644
--- a/.config/quickshell/modules/sidebarLeft/AiChat.qml
+++ b/.config/quickshell/modules/sidebarLeft/AiChat.qml
@@ -282,14 +282,8 @@ int main(int argc, char* argv[]) {
                 }
                 delegate: ApiCommandButton {
                     id: commandButton
+                    colBackground: suggestions.selectedIndex === index ? Appearance.colors.colLayer2Hover : Appearance.colors.colLayer2
 
-                    background: Rectangle {
-                        radius: Appearance.rounding.small
-                        color: suggestions.selectedIndex === index ? Appearance.colors.colLayer2Hover : 
-                            commandButton.down ? Appearance.colors.colLayer2Active : 
-                            commandButton.hovered ? Appearance.colors.colLayer2Hover :
-                            Appearance.colors.colLayer2
-                    }
                     contentItem: RowLayout {
                         spacing: 5
                         StyledText {
@@ -440,13 +434,15 @@ int main(int argc, char* argv[]) {
                     }
                 }
 
-                Button { // Send button
+                RippleButton { // Send button
                     id: sendButton
                     Layout.alignment: Qt.AlignTop
                     Layout.rightMargin: 5
                     implicitWidth: 40
                     implicitHeight: 40
+                    buttonRadius: Appearance.rounding.small
                     enabled: messageInputField.text.length > 0
+                    toggled: enabled
 
                     MouseArea {
                         anchors.fill: parent
@@ -458,17 +454,6 @@ int main(int argc, char* argv[]) {
                         }
                     }
 
-                    background: Rectangle {
-                        radius: Appearance.rounding.small
-                        color: sendButton.enabled ? (sendButton.down ? Appearance.colors.colPrimaryActive : 
-                            sendButton.hovered ? Appearance.colors.colPrimaryHover :
-                            Appearance.m3colors.m3primary) : Appearance.colors.colLayer2Disabled
-                            
-                        Behavior on color {
-                            animation: Appearance.animation.elementMoveFast.colorAnimation.createObject(this)
-                        }
-                    }
-
                     contentItem: MaterialSymbol {
                         anchors.centerIn: parent
                         horizontalAlignment: Text.AlignHCenter
@@ -546,16 +531,6 @@ int main(int argc, char* argv[]) {
                         id: commandButton
                         property string commandRepresentation: `${root.commandPrefix}${modelData.name}`
                         buttonText: commandRepresentation
-                        background: Rectangle {
-                            radius: Appearance.rounding.small
-                            color: commandButton.down ? Appearance.colors.colLayer2Active : 
-                                commandButton.hovered ? Appearance.colors.colLayer2Hover :
-                                Appearance.colors.colLayer2
-                                
-                            Behavior on color {
-                                animation: Appearance.animation.elementMoveFast.colorAnimation.createObject(this)
-                            }
-                        }
                         onClicked: {
                             if(modelData.sendDirectly) {
                                 root.handleInput(commandRepresentation)
diff --git a/.config/quickshell/modules/sidebarLeft/Anime.qml b/.config/quickshell/modules/sidebarLeft/Anime.qml
index fb1182f80..166c237fa 100644
--- a/.config/quickshell/modules/sidebarLeft/Anime.qml
+++ b/.config/quickshell/modules/sidebarLeft/Anime.qml
@@ -309,14 +309,8 @@ Item {
                 delegate: ApiCommandButton {
                     id: tagButton
 
-                    background: Rectangle {
-                        radius: Appearance.rounding.small
-                        color: tagSuggestions.selectedIndex === index ? Appearance.colors.colLayer2Hover : 
-                            tagButton.down ? Appearance.colors.colLayer2Active : 
-                            tagButton.hovered ? Appearance.colors.colLayer2Hover :
-                            Appearance.colors.colLayer2
-
-                    }
+                    colBackground: tagSuggestions.selectedIndex === index ? Appearance.colors.colLayer2Hover : Appearance.colors.colLayer2
+                    
                     contentItem: RowLayout {
                         spacing: 5
                         StyledText {
@@ -487,13 +481,15 @@ Item {
                     }
                 }
 
-                Button { // Send button
+                RippleButton { // Send button
                     id: sendButton
                     Layout.alignment: Qt.AlignTop
                     Layout.rightMargin: 5
                     implicitWidth: 40
                     implicitHeight: 40
+                    buttonRadius: Appearance.rounding.small
                     enabled: tagInputField.text.length > 0
+                    toggled: enabled
 
                     MouseArea {
                         anchors.fill: parent
@@ -505,17 +501,6 @@ Item {
                         }
                     }
 
-                    background: Rectangle {
-                        radius: Appearance.rounding.small
-                        color: sendButton.enabled ? (sendButton.down ? Appearance.colors.colPrimaryActive : 
-                            sendButton.hovered ? Appearance.colors.colPrimaryHover :
-                            Appearance.m3colors.m3primary) : Appearance.colors.colLayer2Disabled
-                            
-                        Behavior on color {
-                            animation: Appearance.animation.elementMoveFast.colorAnimation.createObject(this)
-                        }
-                    }
-
                     contentItem: MaterialSymbol {
                         anchors.centerIn: parent
                         horizontalAlignment: Text.AlignHCenter
@@ -637,16 +622,8 @@ Item {
                         id: tagButton
                         property string commandRepresentation: `${root.commandPrefix}${modelData.name}`
                         buttonText: commandRepresentation
-                        background: Rectangle {
-                            radius: Appearance.rounding.small
-                            color: tagButton.down ? Appearance.colors.colLayer2Active : 
-                                tagButton.hovered ? Appearance.colors.colLayer2Hover :
-                                Appearance.colors.colLayer2
-                                
-                            Behavior on color {
-                                animation: Appearance.animation.elementMoveFast.colorAnimation.createObject(this)
-                            }
-                        }
+                        colBackground: Appearance.colors.colLayer2
+
                         onClicked: {
                             if(modelData.sendDirectly) {
                                 root.handleInput(commandRepresentation)
diff --git a/.config/quickshell/modules/sidebarLeft/ApiCommandButton.qml b/.config/quickshell/modules/sidebarLeft/ApiCommandButton.qml
index cd54e8a3c..dc414bfb0 100644
--- a/.config/quickshell/modules/sidebarLeft/ApiCommandButton.qml
+++ b/.config/quickshell/modules/sidebarLeft/ApiCommandButton.qml
@@ -6,7 +6,7 @@ import QtQuick.Controls
 import QtQuick.Layouts
 import Quickshell
 
-Button {
+RippleButton {
     id: button
     property string buttonText
 
@@ -14,14 +14,9 @@ Button {
     leftPadding: 10
     rightPadding: 10
 
-    PointingHandInteraction {}
-
-    background: Rectangle {
-        radius: Appearance.rounding.small
-        color: (button.down ? Appearance.colors.colSurfaceContainerHighestActive : 
-            button.hovered ? Appearance.colors.colSurfaceContainerHighestHover :
-            Appearance.m3colors.m3surfaceContainerHighest)
-    }
+    colBackground: Appearance.colors.colLayer2
+    colBackgroundHover: Appearance.colors.colLayer2Hover
+    colRipple: Appearance.colors.colLayer2Active
 
     contentItem: StyledText {
         horizontalAlignment: Text.AlignHCenter
diff --git a/.config/quickshell/modules/sidebarLeft/aiChat/AiMessageControlButton.qml b/.config/quickshell/modules/sidebarLeft/aiChat/AiMessageControlButton.qml
index 96b967538..2effec24c 100644
--- a/.config/quickshell/modules/sidebarLeft/aiChat/AiMessageControlButton.qml
+++ b/.config/quickshell/modules/sidebarLeft/aiChat/AiMessageControlButton.qml
@@ -7,31 +7,15 @@ import QtQuick.Controls
 import QtQuick.Layouts
 import Quickshell
 
-Button {
+RippleButton {
     id: button
     property string buttonIcon
     property bool activated: false
+    toggled: activated
 
     implicitHeight: 30
     implicitWidth: 30
 
-    PointingHandInteraction {}
-
-    background: Rectangle {
-        radius: Appearance.rounding.small
-        color: !button.enabled ? ColorUtils.transparentize(Appearance.m3colors.m3surfaceContainerHighest, 1) : 
-            button.activated ? (button.down ? Appearance.colors.colPrimaryActive : 
-            button.hovered ? Appearance.colors.colPrimaryHover :
-            Appearance.m3colors.m3primary) :
-            (button.down ? Appearance.colors.colSurfaceContainerHighestActive : 
-            button.hovered ? Appearance.colors.colSurfaceContainerHighestHover :
-            ColorUtils.transparentize(Appearance.m3colors.m3surfaceContainerHighest, 1))
-
-        Behavior on color {
-            animation: Appearance.animation.elementMoveFast.colorAnimation.createObject(this)
-        }
-    }
-
     contentItem: MaterialSymbol {
         horizontalAlignment: Text.AlignHCenter
         font.pixelSize: Appearance.font.pixelSize.large
diff --git a/.config/quickshell/modules/sidebarLeft/aiChat/AnnotationSourceButton.qml b/.config/quickshell/modules/sidebarLeft/aiChat/AnnotationSourceButton.qml
index 21e4981f7..1c279edd6 100644
--- a/.config/quickshell/modules/sidebarLeft/aiChat/AnnotationSourceButton.qml
+++ b/.config/quickshell/modules/sidebarLeft/aiChat/AnnotationSourceButton.qml
@@ -11,7 +11,7 @@ import Quickshell.Io
 import Quickshell.Widgets
 import Quickshell.Hyprland
 
-Button {
+RippleButton {
     id: root
     property string displayText
     property string url
@@ -27,6 +27,10 @@ Button {
     implicitHeight: 30
     leftPadding: (implicitHeight - faviconSize) / 2
     rightPadding: 10
+    buttonRadius: Appearance.rounding.full
+    colBackground: Appearance.m3colors.m3surfaceContainerHighest
+    colBackgroundHover: Appearance.colors.colSurfaceContainerHighestHover
+    colRipple: Appearance.colors.colSurfaceContainerHighestActive
 
     Process {
         id: faviconDownloadProcess
@@ -49,13 +53,6 @@ Button {
         }
     }
 
-    background: Rectangle {
-        radius: Appearance.rounding.full
-        color: (root.down ? Appearance.colors.colSurfaceContainerHighestActive : 
-            root.hovered ? Appearance.colors.colSurfaceContainerHighestHover :
-            Appearance.m3colors.m3surfaceContainerHighest)
-    }
-
     contentItem: RowLayout {
         spacing: 5
         IconImage {
diff --git a/.config/quickshell/modules/sidebarLeft/aiChat/MessageThinkBlock.qml b/.config/quickshell/modules/sidebarLeft/aiChat/MessageThinkBlock.qml
index e00615b06..27dae3bd3 100644
--- a/.config/quickshell/modules/sidebarLeft/aiChat/MessageThinkBlock.qml
+++ b/.config/quickshell/modules/sidebarLeft/aiChat/MessageThinkBlock.qml
@@ -102,35 +102,18 @@ Item {
                     text: root.completed ? qsTr("Chain of Thought") : (qsTr("Thinking") + ".".repeat(Math.random() * 4))
                 }
                 Item { Layout.fillWidth: true }
-                Button { // Expand button
+                RippleButton { // Expand button
                     id: expandButton
                     visible: root.completed
                     implicitWidth: 22
                     implicitHeight: 22
+                    colBackground: headerMouseArea.containsMouse ? Appearance.colors.colLayer2Hover
+                        : ColorUtils.transparentize(Appearance.colors.colLayer2, 1)
+                    colBackgroundHover: Appearance.colors.colLayer2Hover
+                    colRipple: Appearance.colors.colLayer2Active
 
-                    PointingHandInteraction{}
-                    onClicked: {
-                        root.collapsed = !root.collapsed
-                    }
-
-                    background: Rectangle {
-                        anchors.fill: parent
-                        radius: Appearance.rounding.full
-                        color: (headerMouseArea.pressed) ? Appearance.colors.colLayer2Active
-                            : (headerMouseArea.containsMouse ? Appearance.colors.colLayer2Hover
-                            : ColorUtils.transparentize(Appearance.colors.colLayer2, 1))
-                        
-                        Behavior on color {
-                            ColorAnimation {
-                                duration: collapseAnimation.duration
-                                easing.type: collapseAnimation.type
-                                easing.bezierCurve: collapseAnimation.bezierCurve
-                            }
-
-                        }
-
-                    }
-
+                    onClicked: { root.collapsed = !root.collapsed }
+                    
                     contentItem: MaterialSymbol {
                         anchors.centerIn: parent
                         text: "keyboard_arrow_down"
diff --git a/.config/quickshell/modules/sidebarLeft/anime/BooruImage.qml b/.config/quickshell/modules/sidebarLeft/anime/BooruImage.qml
index 4a754f813..5db0a06be 100644
--- a/.config/quickshell/modules/sidebarLeft/anime/BooruImage.qml
+++ b/.config/quickshell/modules/sidebarLeft/anime/BooruImage.qml
@@ -46,8 +46,6 @@ Button {
     implicitWidth: imageObject.width
     implicitHeight: imageObject.height
 
-    // PointingHandInteraction {}
-
     background: Rectangle {
         implicitWidth: imageObject.width
         implicitHeight: imageObject.height
@@ -84,7 +82,7 @@ Button {
             }
         }
 
-        Button {
+        RippleButton {
             id: menuButton
             anchors.top: parent.top
             anchors.right: parent.right
@@ -92,19 +90,15 @@ Button {
             implicitHeight: 30
             implicitWidth: 30
 
-            PointingHandInteraction {}
+            buttonRadius: Appearance.rounding.full
+            colBackground: ColorUtils.transparentize(Appearance.m3colors.m3surface, 0.3)
+            colBackgroundHover: ColorUtils.transparentize(ColorUtils.mix(Appearance.m3colors.m3surface, Appearance.m3colors.m3onSurface, 0.8), 0.2)
+            colRipple: ColorUtils.transparentize(ColorUtils.mix(Appearance.m3colors.m3surface, Appearance.m3colors.m3onSurface, 0.6), 0.1)
 
             StyledToolTip {
                 content: `${StringUtils.wordWrap(root.imageData.tags, root.maxTagStringLineLength)}\n${qsTr("Click for options")}`
             }
 
-            background: Rectangle {
-                color: menuButton.down ? ColorUtils.transparentize(ColorUtils.mix(Appearance.m3colors.m3surface, Appearance.m3colors.m3onSurface, 0.6), 0.1) :
-                    menuButton.hovered ? ColorUtils.transparentize(ColorUtils.mix(Appearance.m3colors.m3surface, Appearance.m3colors.m3onSurface, 0.8), 0.2) :
-                    ColorUtils.transparentize(Appearance.m3colors.m3surface, 0.3)
-                radius: Appearance.rounding.full
-            }
-
             contentItem: MaterialSymbol {
                 horizontalAlignment: Text.AlignHCenter
                 iconSize: Appearance.font.pixelSize.large
diff --git a/.config/quickshell/modules/sidebarLeft/anime/BooruResponse.qml b/.config/quickshell/modules/sidebarLeft/anime/BooruResponse.qml
index 4f6b63863..fcc99f08d 100644
--- a/.config/quickshell/modules/sidebarLeft/anime/BooruResponse.qml
+++ b/.config/quickshell/modules/sidebarLeft/anime/BooruResponse.qml
@@ -251,7 +251,7 @@ Rectangle {
             }
         }
 
-        Button { // Next page button
+        RippleButton { // Next page button
             id: button
             property string buttonText
             visible: root.responseData.page != "" && root.responseData.page > 0
@@ -261,18 +261,15 @@ Rectangle {
             leftPadding: 10
             rightPadding: 5
 
-            PointingHandInteraction {}
             onClicked: {
                 tagInputField.text = `${responseData.tags.join(" ")} ${parseInt(root.responseData.page) + 1}`
                 tagInputField.accept()
             }
 
-            background: Rectangle {
-                radius: Appearance.rounding.small
-                color: (button.down ? Appearance.colors.colSurfaceContainerHighestActive : 
-                    button.hovered ? Appearance.colors.colSurfaceContainerHighestHover :
-                    Appearance.m3colors.m3surfaceContainerHighest)
-            }
+            buttonRadius: Appearance.rounding.small
+            colBackground: Appearance.m3colors.m3surfaceContainerHighest
+            colBackgroundHover: Appearance.colors.colSurfaceContainerHighestHover
+            colRipple: Appearance.colors.colSurfaceContainerHighestActive            
 
             contentItem: Item {
                 anchors.fill: parent
diff --git a/.config/quickshell/modules/sidebarRight/calendar/CalendarDayButton.qml b/.config/quickshell/modules/sidebarRight/calendar/CalendarDayButton.qml
index 041c64a7a..29bfee05c 100644
--- a/.config/quickshell/modules/sidebarRight/calendar/CalendarDayButton.qml
+++ b/.config/quickshell/modules/sidebarRight/calendar/CalendarDayButton.qml
@@ -5,7 +5,7 @@ import QtQuick
 import QtQuick.Controls
 import QtQuick.Layouts
 
-Button {
+RippleButton {
     id: button
     property string day
     property int isToday
@@ -17,20 +17,8 @@ Button {
     implicitWidth: 38; 
     implicitHeight: 38;
 
-    background: Rectangle {
-        anchors.fill: parent
-        radius: Appearance.rounding.full
-        color: (isToday == 1) ? ((interactable && button.down) ? Appearance.colors.colPrimaryActive : 
-            (interactable && button.hovered) ? Appearance.colors.colPrimaryHover : 
-            Appearance.m3colors.m3primary) : 
-            (interactable && button.down) ? Appearance.colors.colLayer1Active : 
-            (interactable && button.hovered) ? Appearance.colors.colLayer1Hover : 
-            ColorUtils.transparentize(Appearance.colors.colLayer1, 1)
-
-        Behavior on color {
-            animation: Appearance.animation.elementMoveFast.colorAnimation.createObject(this)
-        }
-    }
+    toggled: (isToday == 1)
+    buttonRadius: Appearance.rounding.small
     
     contentItem: StyledText {
         anchors.fill: parent
diff --git a/.config/quickshell/modules/sidebarRight/calendar/CalendarHeaderButton.qml b/.config/quickshell/modules/sidebarRight/calendar/CalendarHeaderButton.qml
index 16d916b6c..92ef3c854 100644
--- a/.config/quickshell/modules/sidebarRight/calendar/CalendarHeaderButton.qml
+++ b/.config/quickshell/modules/sidebarRight/calendar/CalendarHeaderButton.qml
@@ -4,7 +4,7 @@ import QtQuick
 import QtQuick.Controls
 import QtQuick.Layouts
 
-Button {
+RippleButton {
     id: button
     property string buttonText: ""
     property string tooltipText: ""
@@ -18,18 +18,12 @@ Button {
         }
     }
 
-    PointingHandInteraction {}
+    background.anchors.fill: button
+    buttonRadius: Appearance.rounding.full
+    colBackground: Appearance.colors.colLayer2
+    colBackgroundHover: Appearance.colors.colLayer2Hover
+    colRipple: Appearance.colors.colLayer2Active
 
-    background: Rectangle {
-        anchors.fill: parent
-        radius: Appearance.rounding.full
-        color: (button.down) ? Appearance.colors.colLayer2Active : (button.hovered ? Appearance.colors.colLayer2Hover : Appearance.colors.colLayer2)
-
-        Behavior on color {
-            animation: Appearance.animation.elementMoveFast.colorAnimation.createObject(this)
-        }
-
-    }
     contentItem: StyledText {
         text: buttonText
         horizontalAlignment: Text.AlignHCenter
diff --git a/.config/quickshell/modules/sidebarRight/notifications/NotificationStatusButton.qml b/.config/quickshell/modules/sidebarRight/notifications/NotificationStatusButton.qml
index 568d7ad11..0f29107ac 100644
--- a/.config/quickshell/modules/sidebarRight/notifications/NotificationStatusButton.qml
+++ b/.config/quickshell/modules/sidebarRight/notifications/NotificationStatusButton.qml
@@ -4,12 +4,12 @@ import QtQuick
 import QtQuick.Controls
 import QtQuick.Layouts
 
-Button {
+RippleButton {
     id: button
     property string buttonText: ""
     property string buttonIcon: ""
 
-    // implicitHeight: 30
+    implicitHeight: 30
     implicitWidth: contentRowLayout.implicitWidth + 10 * 2
     Behavior on implicitWidth {
         SmoothedAnimation {
@@ -17,33 +17,29 @@ Button {
         }
     }
 
-    PointingHandInteraction {}
+    buttonRadius: Appearance.rounding.full
+    colBackground: Appearance.colors.colLayer2
+    colBackgroundHover: Appearance.colors.colLayer2Hover
+    colRipple: Appearance.colors.colLayer2Active
+    background.anchors.fill: button
 
-    background: Rectangle {
-        anchors.fill: parent
-        radius: Appearance.rounding.full
-        color: (button.down) ? Appearance.colors.colLayer2Active : (button.hovered ? Appearance.colors.colLayer2Hover : Appearance.colors.colLayer2)
-
-        Behavior on color {
-            animation: Appearance.animation.elementMoveFast.colorAnimation.createObject(this)
-        }
-
-    }
-    contentItem: RowLayout {
-        id: contentRowLayout
-        anchors.centerIn: parent
-        spacing: 0
-        MaterialSymbol {
-            text: buttonIcon
-            Layout.fillWidth: false
-            iconSize: Appearance.font.pixelSize.larger
-            color: Appearance.colors.colOnLayer1
-        }
-        StyledText {
-            text: buttonText
-            Layout.fillWidth: false
-            font.pixelSize: Appearance.font.pixelSize.small
-            color: Appearance.colors.colOnLayer1
+    contentItem: Item {
+        RowLayout {
+            id: contentRowLayout
+            anchors.centerIn: parent
+            spacing: 0
+            MaterialSymbol {
+                text: buttonIcon
+                Layout.fillWidth: false
+                iconSize: Appearance.font.pixelSize.larger
+                color: Appearance.colors.colOnLayer1
+            }
+            StyledText {
+                text: buttonText
+                Layout.fillWidth: false
+                font.pixelSize: Appearance.font.pixelSize.small
+                color: Appearance.colors.colOnLayer1
+            }
         }
     }
 
diff --git a/.config/quickshell/modules/sidebarRight/quickToggles/QuickToggleButton.qml b/.config/quickshell/modules/sidebarRight/quickToggles/QuickToggleButton.qml
index 0bb94cffb..bc200142a 100644
--- a/.config/quickshell/modules/sidebarRight/quickToggles/QuickToggleButton.qml
+++ b/.config/quickshell/modules/sidebarRight/quickToggles/QuickToggleButton.qml
@@ -5,41 +5,27 @@ import QtQuick
 import QtQuick.Controls
 import Quickshell.Io
 
-Button {
+RippleButton {
     id: button
-
-    property bool toggled
     property string buttonIcon
+    toggled: false
+    buttonRadius: Appearance?.rounding?.full ?? 9999
 
     implicitWidth: 40
     implicitHeight: 40
 
-    PointingHandInteraction {}
-
-    background: Rectangle {
-        anchors.fill: parent
-        radius: Appearance.rounding.full
-        color: toggled ? 
-            (button.down ? Appearance.colors.colPrimaryActive : button.hovered ? Appearance.colors.colPrimaryHover : Appearance.m3colors.m3primary) :
-            (button.down ? Appearance.colors.colLayer1Active : button.hovered ? Appearance.colors.colLayer1Hover : ColorUtils.transparentize(Appearance.colors.colLayer1Hover, 1))
+    contentItem: MaterialSymbol {
+        anchors.centerIn: parent
+        iconSize: Appearance.font.pixelSize.larger
+        fill: toggled ? 1 : 0
+        color: toggled ? Appearance.m3colors.m3onPrimary : Appearance.colors.colOnLayer1
+        horizontalAlignment: Text.AlignHCenter
+        verticalAlignment: Text.AlignVCenter
+        text: buttonIcon
 
         Behavior on color {
             animation: Appearance.animation.elementMoveFast.colorAnimation.createObject(this)
-
         }
-        
-        MaterialSymbol {
-            anchors.centerIn: parent
-            iconSize: Appearance.font.pixelSize.larger
-            fill: toggled ? 1 : 0
-            text: buttonIcon
-            color: toggled ? Appearance.m3colors.m3onPrimary : Appearance.colors.colOnLayer1
-
-            Behavior on color {
-                animation: Appearance.animation.elementMoveFast.colorAnimation.createObject(this)
-            }
-        }
-
     }
 
 }
diff --git a/.config/quickshell/modules/sidebarRight/todo/TodoItemActionButton.qml b/.config/quickshell/modules/sidebarRight/todo/TodoItemActionButton.qml
index 1b1881776..e013a18bc 100644
--- a/.config/quickshell/modules/sidebarRight/todo/TodoItemActionButton.qml
+++ b/.config/quickshell/modules/sidebarRight/todo/TodoItemActionButton.qml
@@ -5,7 +5,7 @@ import QtQuick
 import QtQuick.Controls
 import QtQuick.Layouts
 
-Button {
+RippleButton {
     id: button
     property string buttonText: ""
     property string tooltipText: ""
@@ -13,24 +13,14 @@ Button {
     implicitHeight: 30
     implicitWidth: implicitHeight
 
-    PointingHandInteraction {}
-
     Behavior on implicitWidth {
         SmoothedAnimation {
             velocity: Appearance.animation.elementMove.velocity
         }
     }
 
-    background: Rectangle {
-        anchors.fill: parent
-        radius: Appearance.rounding.full
-        color: (button.down) ? Appearance.colors.colLayer2Active : (button.hovered ? Appearance.colors.colLayer2Hover : ColorUtils.transparentize(Appearance.colors.colLayer2, 1))
+    buttonRadius: Appearance.rounding.small
 
-        Behavior on color {
-            animation: Appearance.animation.elementMoveFast.colorAnimation.createObject(this)
-        }
-
-    }
     contentItem: StyledText {
         text: buttonText
         horizontalAlignment: Text.AlignHCenter
diff --git a/.config/quickshell/modules/sidebarRight/volumeMixer/AudioDeviceSelectorButton.qml b/.config/quickshell/modules/sidebarRight/volumeMixer/AudioDeviceSelectorButton.qml
index 643889048..05249a6c7 100644
--- a/.config/quickshell/modules/sidebarRight/volumeMixer/AudioDeviceSelectorButton.qml
+++ b/.config/quickshell/modules/sidebarRight/volumeMixer/AudioDeviceSelectorButton.qml
@@ -8,21 +8,14 @@ import QtQuick.Layouts
 import Quickshell.Widgets
 import Quickshell.Services.Pipewire
 
-Button {
+RippleButton {
     id: button
     required property bool input
 
-    background: Rectangle {
-        anchors.fill: parent
-        radius: Appearance.rounding.small
-        color: (button.down) ? Appearance.colors.colLayer2Active : (button.hovered ? Appearance.colors.colLayer2Hover : Appearance.colors.colLayer2)
-
-        Behavior on color {
-            animation: Appearance.animation.elementMoveFast.colorAnimation.createObject(this)
-        }
-    }
-
-    PointingHandInteraction {}
+    buttonRadius: Appearance.rounding.small
+    colBackground: Appearance.colors.colLayer2
+    colBackgroundHover: Appearance.colors.colLayer2Hover
+    colRipple: Appearance.colors.colLayer2Active
 
     contentItem: RowLayout {
         anchors.fill: parent