Bug 1022098 - Icon fallbcaks

This reverts commit eb6ee91f3e0541fa3c873cf90159e953420d61d0.