Added nontransparant icon
merge