adding support for text/icon
layout fix