Merge "Fix KQS arrow button padding" into main