Icons_controller and Icons_viewer become Buttons_controller and Buttons_viewer.