Issue 7000: Fixed icon issues according to feedback