don't user 'OTHER' indicator, and get icon paths instead of hard coding