fix for #308 and #306 + small icon fix