Fix cmake code
Fix some unused code
Change some icons