Bug Fix: Duplicate Icons