diff --git a/storybook/pages/StatusButtonPage.qml b/storybook/pages/StatusButtonPage.qml
index cebfd4ed47..5ed519c442 100644
--- a/storybook/pages/StatusButtonPage.qml
+++ b/storybook/pages/StatusButtonPage.qml
@@ -203,7 +203,6 @@ SplitView {
                         enabled: ctrlEnabled.checked
                         interactive: ctrlInteractive.checked
                         isRoundIcon: true
-                        radius: height/2
                         textFillWidth: ctrlFillWidth.checked
                     }
                 }
diff --git a/ui/StatusQ/src/StatusQ/Controls/StatusBackButton.qml b/ui/StatusQ/src/StatusQ/Controls/StatusBackButton.qml
index cd62c848a5..cb9694e2bc 100644
--- a/ui/StatusQ/src/StatusQ/Controls/StatusBackButton.qml
+++ b/ui/StatusQ/src/StatusQ/Controls/StatusBackButton.qml
@@ -3,6 +3,5 @@ import StatusQ.Controls 0.1
 
 StatusButton {
     isRoundIcon: true
-    radius: height/2
     icon.name: "arrow-left"
 }
diff --git a/ui/StatusQ/src/StatusQ/Controls/StatusBaseButton.qml b/ui/StatusQ/src/StatusQ/Controls/StatusBaseButton.qml
index 9e195dcdd1..55ec6b14e7 100644
--- a/ui/StatusQ/src/StatusQ/Controls/StatusBaseButton.qml
+++ b/ui/StatusQ/src/StatusQ/Controls/StatusBaseButton.qml
@@ -50,7 +50,7 @@ Button {
     property int borderWidth: 0
     property bool textFillWidth: false
 
-    property int radius: isRoundIcon ? height/2 : size === StatusBaseButton.Size.Tiny ? 6 : 8
+    property int radius: isRoundIcon && d.iconOnly ? height/2 : size === StatusBaseButton.Size.Tiny ? 6 : 8
 
     property int size: StatusBaseButton.Size.Large
     property int type: StatusBaseButton.Type.Normal
@@ -241,8 +241,8 @@ Button {
 
         StatusRoundIcon {
             asset.name: root.icon.name
-            asset.width: root.icon.width
-            asset.height: root.icon.height
+            asset.width: d.iconSize
+            asset.height: d.iconSize
             asset.color: root.icon.color
             asset.bgColor: root.asset.bgColor
         }
diff --git a/ui/app/AppLayouts/Wallet/controls/SwapExchangeButton.qml b/ui/app/AppLayouts/Wallet/controls/SwapExchangeButton.qml
index 593022d7af..9e1c656039 100644
--- a/ui/app/AppLayouts/Wallet/controls/SwapExchangeButton.qml
+++ b/ui/app/AppLayouts/Wallet/controls/SwapExchangeButton.qml
@@ -13,7 +13,6 @@ StatusButton {
 
     focusPolicy: Qt.NoFocus
     isRoundIcon: true
-    radius: height/2
     normalColor: Theme.palette.indirectColor3
     disabledColor: normalColor
     opacity: enabled ? 1 : 0.4