Issue #22393: Fixed sizing and alignment issues