Merge "Fix system icons being truncated when increasing display/font size" into main