Fixes and Icon adding