Fix flickering arrow animations

Improvement for #19