Use cairo_rotate with the indicator & minor cleanup.