Fix for large icon in menus and image close slowness