Continued testing for Icons
Revert 3a791b3..ac3024a

This rolls back to commit 3a791b3a33bd1ff0ceae5bee16e4739ee16314d0.