mark merge_icon as private
adjust the layout a bit