change icon to be more fitting.
add support for ellipsis.