before merge
added new icon
added icon