diff --git a/OsmAnd/src/net/osmand/plus/profiles/EditProfileFragment.java b/OsmAnd/src/net/osmand/plus/profiles/EditProfileFragment.java
index 16694509f2..9e95858100 100644
--- a/OsmAnd/src/net/osmand/plus/profiles/EditProfileFragment.java
+++ b/OsmAnd/src/net/osmand/plus/profiles/EditProfileFragment.java
@@ -178,6 +178,7 @@ public class EditProfileFragment extends BaseOsmAndFragment {
 			isDataChanged = true;
 			startIconId = profile.parent.getSmallIconDark();
 			profile.iconId = startIconId;
+			profile.iconStringName = profile.parent.getIconName();
 		} else if (isUserProfile) {
 			title = profile.userProfileTitle;
 			profileNameEt.setText(title);
diff --git a/OsmAnd/src/net/osmand/plus/profiles/ProfileMenuAdapter.java b/OsmAnd/src/net/osmand/plus/profiles/ProfileMenuAdapter.java
index 4db5def5cb..5f97c1fb62 100644
--- a/OsmAnd/src/net/osmand/plus/profiles/ProfileMenuAdapter.java
+++ b/OsmAnd/src/net/osmand/plus/profiles/ProfileMenuAdapter.java
@@ -103,11 +103,7 @@ public class ProfileMenuAdapter extends RecyclerView.Adapter<ProfileViewHolder>
 			: ApplicationMode.getIconResFromName(app, item.getIconName(), app.getPackageName());
 
 		if (iconRes == 0 || iconRes == -1) {
-			if (item.getParent() != null) {
-				iconRes = item.getParent().getSmallIconDark();
-			} else {
-				iconRes = R.drawable.ic_action_world_globe;
-			}
+			iconRes = R.drawable.ic_action_world_globe;
 		}
 
 		if (selectedItems.contains(item)) {