Fix icons displaying incorrectly
Fix empty images