Cleanup code and fix icons