am 2e07da70: Line breaks are respected and text no longer overlaps secondary icons

* commit '2e07da704662e9926ba83714188d156cc8b6511e':
  Line breaks are respected and text no longer overlaps secondary icons