Back to mostly straight corners, less padding