Fix: Wrong icon selection logic fixed

Fix: Wrong icon selection logic fixed