K3.1 Fix buttons after merge #2431