[#61091326] Fix buttons a little more