Fixes, icon, etc