Added button compatibility with the theme