Converted to use new sun buttons with flat shading, see #139