Fix UI glitches and flat icon
Screenshots