fix merge

library/Class/Admin/Skin.php

@@ -85,7 +85,7 @@ class Class_Admin_Skin {
 
 
   public function renderMenuIconOn($name, $view, $attribs = []) {
-    if (!$src = $this->getIconUrlOn('icons', $name))
+    if (!$src = $this->getIconUrl('icons', $name))
       return '';
 
     return $view->tagImg($src,$attribs);
@@ -93,7 +93,7 @@ class Class_Admin_Skin {
 
 
   public function renderActionIconOn($name, $view, $attribs = []) {
-    if (!$src = $this->getIconUrlOn('actions', $name))
+    if (!$src = $this->getIconUrl('actions', $name))
       return '';
 
     return $view->tagImg($src, $attribs);