Multiple small fixes
Icon need updated, multiple small fixes done