Merge "Update Compat UI colours and padding" into main