Small Fixes and icon change