Icon handling looks nice now