icon replacements and consolidation

Signed-off-by: Predrag Kanazir <predrag@arraystudio.com>