Updated to support images as icons