some fixes for null-pointers on icons