Custom data icons bug976951

https://bugzilla.mozilla.org/show_bug.cgi?id=976951

Addressing the comments I left in #16739.