diff --git a/mojotrollz/api/char/race_visuals.php b/mojotrollz/api/char/race_visuals.php
index 75a49ae..75f1a1b 100644
--- a/mojotrollz/api/char/race_visuals.php
+++ b/mojotrollz/api/char/race_visuals.php
@@ -29,7 +29,7 @@ class race_visuals {
             case self::VISUAL_FACIAL_HAIR_COLOR:
                 return self::VISUAL_FACIAL_HAIR_COLOR_NAME;
             default:
-                return 'visual not valid';
+                return 'default';
         }
     }
 }
diff --git a/mojotrollz/api/database/player_races.php b/mojotrollz/api/database/player_races.php
index ca07688..e855f02 100644
--- a/mojotrollz/api/database/player_races.php
+++ b/mojotrollz/api/database/player_races.php
@@ -43,7 +43,7 @@ class player_races {
             case self::TROLL:
                 return self::TROLL_NAME;
             default:
-                return 'race not valid';
+                return 'default';
         }
     }
     
diff --git a/mojotrollz/sai/saimod_mojotrollz_skilltree/saimod_mojotrollz_skilltree.js b/mojotrollz/sai/saimod_mojotrollz_skilltree/saimod_mojotrollz_skilltree.js
index 2a350f8..b637ffb 100644
--- a/mojotrollz/sai/saimod_mojotrollz_skilltree/saimod_mojotrollz_skilltree.js
+++ b/mojotrollz/sai/saimod_mojotrollz_skilltree/saimod_mojotrollz_skilltree.js
@@ -12,6 +12,7 @@ function load_skilltree_tab(tree){
     $('img#loader').show();
     $('#tab_skilltree').load(SAI_ENDPOINT+'sai_mod=saimod_mojotrollz_skilltree&action=tree&tree='+tree, function(){
         register_icon_add();
+        register_icon_edit();
         register_icon_delete();
         register_tree_edit();
         skilltree();
@@ -43,6 +44,23 @@ function register_icon_add(){
     });
 }
 
+function register_icon_edit(){
+    $('.btn_icon_edit').click(function(){
+        $('#input_tree').val($(this).attr('tree'));
+        $('#input_row').val($(this).attr('row'));
+        $('#input_column').val($(this).attr('column'));
+        $('#input_type').val($(this).attr('_type'));
+        $('#input_border').val($(this).attr('border'));
+        $('#input_icon').val($(this).attr('icon'));
+        $('#input_max').val($(this).attr('max'));
+        $('#input_parent_row').val($(this).attr('parent_row'));
+        $('#input_parent_column').val($(this).attr('parent_column'));
+        
+        
+        $("#btn_icon_add").focus();
+    });
+}
+
 function register_icon_delete(){
     $('.btn_icon_del').click(function(){
         _class = $(this).attr('_class');
diff --git a/mojotrollz/sai/saimod_mojotrollz_skilltree/tpl/saimod_mojotrollz_skilltree_icon_entry.tpl b/mojotrollz/sai/saimod_mojotrollz_skilltree/tpl/saimod_mojotrollz_skilltree_icon_entry.tpl
index cda9c18..0d5c1bc 100644
--- a/mojotrollz/sai/saimod_mojotrollz_skilltree/tpl/saimod_mojotrollz_skilltree_icon_entry.tpl
+++ b/mojotrollz/sai/saimod_mojotrollz_skilltree/tpl/saimod_mojotrollz_skilltree_icon_entry.tpl
@@ -9,5 +9,6 @@
     <td>${max}</td>
     <td>${parent_row}</td>
     <td>${parent_column}</td>
-    <td><button class="btn btn-danger btn_icon_del" _class="${class}" tree="${tree}" row="${row}" column="${column}">Delete</button></td>
+    <td><button class="btn btn-success btn_icon_edit" _class="${class}" tree="${tree}" row="${row}" column="${column}" _type="${type}" border="${border}" icon="${icon}" max="${max}" parent_row="${parent_row}" parent_column="${parent_column}">Edit</button>
+        <button class="btn btn-danger btn_icon_del" _class="${class}" tree="${tree}" row="${row}" column="${column}">Delete</button></td>
 </tr>
\ No newline at end of file
diff --git a/mojotrollz/sai/saimod_mojotrollz_skilltree/tpl/saimod_mojotrollz_skilltree_page.tpl b/mojotrollz/sai/saimod_mojotrollz_skilltree/tpl/saimod_mojotrollz_skilltree_page.tpl
index ec836be..87d201b 100644
--- a/mojotrollz/sai/saimod_mojotrollz_skilltree/tpl/saimod_mojotrollz_skilltree_page.tpl
+++ b/mojotrollz/sai/saimod_mojotrollz_skilltree/tpl/saimod_mojotrollz_skilltree_page.tpl
@@ -41,6 +41,6 @@ ${skilltree}
         <td><input id="input_max" type="number" placeholder="max" style="width: 50px;"/></td>
         <td><input id="input_parent_row" type="number" placeholder="parent_row" style="width: 75px;"/></td>
         <td><input id="input_parent_column" type="number" placeholder="parent_column" style="width: 75px;"/></td>
-        <td><button class="btn btn-success" id="btn_icon_add" _class="${class}">Add</button></td>
+        <td><button class="btn btn-success" id="btn_icon_add" _class="${class}">Add/Edit</button></td>
     </tr>
 </table>
\ No newline at end of file