diff --git a/OsmAnd/res/layout/favorites_list_item.xml b/OsmAnd/res/layout/favorites_list_item.xml
index 56f4ab5bd9..fbde9d514d 100644
--- a/OsmAnd/res/layout/favorites_list_item.xml
+++ b/OsmAnd/res/layout/favorites_list_item.xml
@@ -72,8 +72,9 @@
                     android:id="@+id/direction"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:layout_gravity="center_vertical"
-                    android:src="@drawable/ic_direction_arrow"/>
+                    android:layout_gravity="top"
+                    android:layout_marginTop="2dp"
+                    android:src="@drawable/ic_direction_arrow" />
 
                 <TextView
                     android:id="@+id/distance"
diff --git a/OsmAnd/src/net/osmand/plus/FavouritesDbHelper.java b/OsmAnd/src/net/osmand/plus/FavouritesDbHelper.java
index bf3bdd87c5..5c3007a80e 100644
--- a/OsmAnd/src/net/osmand/plus/FavouritesDbHelper.java
+++ b/OsmAnd/src/net/osmand/plus/FavouritesDbHelper.java
@@ -577,13 +577,12 @@ public class FavouritesDbHelper {
 	}
 
 	public void addEmptyCategory(String name, int color) {
-		if (FavoriteGroup.isPersonalCategoryDisplayName(context,name))
 			addEmptyCategory(name, color, true);
 	}
 
 	public void addEmptyCategory(String name, int color, boolean visible) {
 		FavoriteGroup group = new FavoriteGroup();
-		group.name = name;
+		group.name = FavoriteGroup.convertDisplayNameToGroupIdName(context, name);
 		group.color = color;
 		group.visible = visible;
 		favoriteGroups.add(group);
@@ -621,7 +620,7 @@ public class FavouritesDbHelper {
 	public boolean groupExists(String name) {
 		String nameLowercase = name.toLowerCase();
 		for (String groupName : flatGroups.keySet()) {
-			if (groupName.toLowerCase().equals(nameLowercase)) {
+			if (groupName.toLowerCase().equals(nameLowercase) || FavoriteGroup.getDisplayName(context, groupName).equals(name)) {
 				return true;
 			}
 		}