Issue 7000: Fixed more icon issues according to feedback