Additional polishing for UI buttons

as suggested in #4002.