diff --git a/core/assets/common/_global/application/avatar/10.jpg b/core/assets/common/_global/application/avatar/10.jpg
index d5264cc7f335298d8d7a06775b4e33011401b1d3..7c273790d5bf0f44293ea0e973cca46ea66e52d7 100644
Binary files a/core/assets/common/_global/application/avatar/10.jpg and b/core/assets/common/_global/application/avatar/10.jpg differ
diff --git a/core/assets/common/_global/application/avatar/11.jpg b/core/assets/common/_global/application/avatar/11.jpg
index 88d425646e6bac3272f0401e13abfa643a8eb781..72a02d4820d698d0122302c3325f10349e9cc1ec 100644
Binary files a/core/assets/common/_global/application/avatar/11.jpg and b/core/assets/common/_global/application/avatar/11.jpg differ
diff --git a/core/assets/common/_global/application/avatar/12.jpg b/core/assets/common/_global/application/avatar/12.jpg
index 1a02f311446c41e0484b3804faab9d54f53d5886..a2bb0246e825d82a5adef7c428b97e7493c84187 100644
Binary files a/core/assets/common/_global/application/avatar/12.jpg and b/core/assets/common/_global/application/avatar/12.jpg differ
diff --git a/core/assets/common/_global/application/avatar/9.jpg b/core/assets/common/_global/application/avatar/9.jpg
index 813c133e608a9430f32cbf491be0abb9fb04264b..dcf9cb7fbf6f99919a9a05a66f7d85a2c7033fab 100644
Binary files a/core/assets/common/_global/application/avatar/9.jpg and b/core/assets/common/_global/application/avatar/9.jpg differ
diff --git a/core/src/cz/nic/tablexia/menu/user/UserAvatarDefinition.java b/core/src/cz/nic/tablexia/menu/user/UserAvatarDefinition.java
index 40b13b9ff12fa20b0c259a3457de03f256fda80f..defe43f21ed7ee14eddba8897b46ab18b01d1ca6 100644
--- a/core/src/cz/nic/tablexia/menu/user/UserAvatarDefinition.java
+++ b/core/src/cz/nic/tablexia/menu/user/UserAvatarDefinition.java
@@ -7,30 +7,36 @@ import cz.nic.tablexia.loader.application.ApplicationAtlasManager;
  */
 public enum  UserAvatarDefinition {
 
-    AVATAR_0(ApplicationAtlasManager.USERMENU_MENUITEM_AVATAR_0),
-    AVATAR_1(ApplicationAtlasManager.USERMENU_MENUITEM_AVATAR_1),
-    AVATAR_2(ApplicationAtlasManager.USERMENU_MENUITEM_AVATAR_2),
-    AVATAR_3(ApplicationAtlasManager.USERMENU_MENUITEM_AVATAR_3),
-    AVATAR_4(ApplicationAtlasManager.USERMENU_MENUITEM_AVATAR_4),
-    AVATAR_5(ApplicationAtlasManager.USERMENU_MENUITEM_AVATAR_5),
-    AVATAR_6(ApplicationAtlasManager.USERMENU_MENUITEM_AVATAR_6),
-    AVATAR_7(ApplicationAtlasManager.USERMENU_MENUITEM_AVATAR_7),
-    AVATAR_8(ApplicationAtlasManager.USERMENU_MENUITEM_AVATAR_8),
-    AVATAR_9(ApplicationAtlasManager.USERMENU_MENUITEM_AVATAR_9),
-    AVATAR_10(ApplicationAtlasManager.USERMENU_MENUITEM_AVATAR_10),
-    AVATAR_11(ApplicationAtlasManager.USERMENU_MENUITEM_AVATAR_11),
-    AVATAR_12(ApplicationAtlasManager.USERMENU_MENUITEM_AVATAR_12);
+    AVATAR_0(ApplicationAtlasManager.USERMENU_MENUITEM_AVATAR_0,13),
+    AVATAR_1(ApplicationAtlasManager.USERMENU_MENUITEM_AVATAR_1,9),
+    AVATAR_2(ApplicationAtlasManager.USERMENU_MENUITEM_AVATAR_2,1),
+    AVATAR_3(ApplicationAtlasManager.USERMENU_MENUITEM_AVATAR_3,10),
+    AVATAR_4(ApplicationAtlasManager.USERMENU_MENUITEM_AVATAR_4,11),
+    AVATAR_5(ApplicationAtlasManager.USERMENU_MENUITEM_AVATAR_5,12),
+    AVATAR_6(ApplicationAtlasManager.USERMENU_MENUITEM_AVATAR_6,2),
+    AVATAR_7(ApplicationAtlasManager.USERMENU_MENUITEM_AVATAR_7,3),
+    AVATAR_8(ApplicationAtlasManager.USERMENU_MENUITEM_AVATAR_8,4),
+    AVATAR_9(ApplicationAtlasManager.USERMENU_MENUITEM_AVATAR_9,5),
+    AVATAR_10(ApplicationAtlasManager.USERMENU_MENUITEM_AVATAR_10,6),
+    AVATAR_11(ApplicationAtlasManager.USERMENU_MENUITEM_AVATAR_11,7),
+    AVATAR_12(ApplicationAtlasManager.USERMENU_MENUITEM_AVATAR_12,8);
 
     private String avatarPath;
+    private int order;
 
-    UserAvatarDefinition(String avatarPath) {
+    UserAvatarDefinition(String avatarPath, int order) {
         this.avatarPath = avatarPath;
+        this.order = order;
     }
 
     public String getAvatarPath() {
         return avatarPath;
     }
 
+    public int getOrder() {
+        return order;
+    }
+
     public static String getAvatar(String id){
         return values()[Integer.parseInt(id)].getAvatarPath();
     }
@@ -38,4 +44,11 @@ public enum  UserAvatarDefinition {
     public static String getAvatar(int id){
         return values()[id].getAvatarPath();
     }
+
+    public static int getOrdinalByOrder(int order) {
+        for(UserAvatarDefinition def : values()) {
+            if(def.getOrder() == order) return def.ordinal();
+        }
+        return 0;
+    }
 }
diff --git a/core/src/cz/nic/tablexia/screen/createuser/FormScreen.java b/core/src/cz/nic/tablexia/screen/createuser/FormScreen.java
index 5a46ae1fff7544c6e153e50574dc18f0dc7bf813..4f234f5082eb477b9ac4f85c4836dbc098030bca 100644
--- a/core/src/cz/nic/tablexia/screen/createuser/FormScreen.java
+++ b/core/src/cz/nic/tablexia/screen/createuser/FormScreen.java
@@ -481,8 +481,9 @@ public class FormScreen extends AbstractTablexiaScreen<Void> {
         // avatar pictures
         HorizontalGroup hg = new HorizontalGroup();
         for (int i = 0; i < TablexiaSettings.AVATAR_COUNT; i++) {
-            final Actor avatar = prepareAvatarPicture(i + 1);
-            avatar.setName(String.valueOf(i + 1));
+            int ordinal = UserAvatarDefinition.getOrdinalByOrder(i + 1);
+            final Actor avatar = prepareAvatarPicture(ordinal);
+            avatar.setName(String.valueOf(ordinal));
             avatar.addListener(new ClickListener() {
                 @Override
                 public void clicked(InputEvent event, float x, float y) {