Simplify logic. Added local icons.