Fix style of some buttons, don't raise
(cherry picked from commit bf5ef7f39732fbc990bdf4a1c76acac53b45f2bd)