* Added additional icon, improved indexes support