Task 236: Replacing icon conditional logic structure.