diff --git a/OsmAnd/src/net/osmand/plus/settings/backend/backup/items/QuickActionsSettingsItem.java b/OsmAnd/src/net/osmand/plus/settings/backend/backup/items/QuickActionsSettingsItem.java
index a17b161299a..2bb4f677463 100644
--- a/OsmAnd/src/net/osmand/plus/settings/backend/backup/items/QuickActionsSettingsItem.java
+++ b/OsmAnd/src/net/osmand/plus/settings/backend/backup/items/QuickActionsSettingsItem.java
@@ -135,7 +135,7 @@ private void readButtonState(@NonNull JSONObject json) {
 				buttonState.setEnabled(object.getBoolean("enabled"));
 
 				String iconName = object.optString("icon");
-				if (Algorithms.isEmpty(iconName)) {
+				if (!Algorithms.isEmpty(iconName)) {
 					buttonState.getIconPref().set(iconName);
 				}
 				int size = object.optInt("size");
@@ -143,11 +143,11 @@ private void readButtonState(@NonNull JSONObject json) {
 					buttonState.getSizePref().set(size);
 				}
 				int cornerRadius = object.optInt("corner_radius");
-				if (cornerRadius > 0) {
+				if (cornerRadius >= 0) {
 					buttonState.getCornerRadiusPref().set(cornerRadius);
 				}
 				float opacity = (float) object.optDouble("opacity");
-				if (opacity > 0) {
+				if (opacity >= 0) {
 					buttonState.getOpacityPref().set(opacity);
 				}
 			} else {
diff --git a/OsmAnd/src/net/osmand/plus/views/mapwidgets/configure/buttons/QuickActionButtonState.java b/OsmAnd/src/net/osmand/plus/views/mapwidgets/configure/buttons/QuickActionButtonState.java
index c3421c05490..edd6afd87eb 100644
--- a/OsmAnd/src/net/osmand/plus/views/mapwidgets/configure/buttons/QuickActionButtonState.java
+++ b/OsmAnd/src/net/osmand/plus/views/mapwidgets/configure/buttons/QuickActionButtonState.java
@@ -198,7 +198,7 @@ public boolean isDefaultButton() {
 	@Override
 	public ButtonAppearanceParams createAppearanceParams() {
 		ButtonAppearanceParams appearanceParams = super.createAppearanceParams();
-		if (!iconPref.isSet()) {
+		if (Algorithms.isEmpty(iconPref.get())) {
 			if (isSingleAction()) {
 				int iconId = getQuickActions().get(0).getIconRes(app);
 				if (iconId > 0) {