Further fixes, new icon