Better drawing function

https://bugzilla.gnome.org/show_bug.cgi?id=710125