diff --git a/qml/StandardButton.qml b/qml/StandardButton.qml
index ab77e20..271477d 100644
--- a/qml/StandardButton.qml
+++ b/qml/StandardButton.qml
@@ -30,12 +30,15 @@ Item {
 
     Rectangle {
         id: _background
-        anchors.fill: parent
+        anchors.centerIn: parent
+        radius: FishUI.Theme.smallRadius
+        width: control.width - radius
+        height: control.height - radius
         color: !flat ? _mouseArea.pressed ? pressedColor : _mouseArea.containsMouse
                                             ? hoveredColor : backgroundColor
                      : _mouseArea.pressed ? flatPressedBg : _mouseArea.containsMouse
                                                            ? flatHoveredBg : flatBg
-        opacity: !flat ? _mouseArea.pressed || _mouseArea.containsMouse ? 0.7 : 0.5 : 1.0
+        opacity: !flat ? _mouseArea.pressed || _mouseArea.containsMouse ? 0.6 : 0.7 : 1.0
     }
 
     MouseArea {
diff --git a/qml/StandardPad.qml b/qml/StandardPad.qml
index 6d9aaf1..5d52d27 100644
--- a/qml/StandardPad.qml
+++ b/qml/StandardPad.qml
@@ -11,6 +11,7 @@ Item {
     GridLayout {
         id: _mainLayout
         anchors.fill: parent
+        anchors.margins: FishUI.Units.smallSpacing
         columnSpacing: 1
         rowSpacing: 1
         columns: 4