Remove default icon, added TODOs