Added some new icons and fixed the bug with it not starting in the edit mode
merged convicts