WV-1012: Restored original button order