- Gtkmm2ext::ArdourIcon::render (cr, _icon, vw, vh, active_state(), text_color);
+ if (_elements & VectorIcon) {
+ Gtkmm2ext::ArdourIcon::render (cr, _icon, vw, vh, active_state(), text_color);
+ } else {
+ cairo_save (cr);
+ rounded_function (cr, 0, 0, get_width(), get_height(), corner_radius + 1.5);
+ cairo_clip (cr);
+ _icon_render_cb (cr, vw, vh, text_color, _icon_render_cb_data);
+ cairo_restore (cr);
+ }