some fixes and icons