3264 with icons overlapping headers in some instances
Merge pull request #840 from sarken/issue_3264

3264 with icons overlapping headers in some instances