Fixes a few bugs and add icon