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

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