iOS-16: better alignment