merge r11179 from trunk to branch 2.2
cleaner 16px delete icon, visual compatible with the 24px delete icon