Added bookmark support, fixed icon creation