Swap flick/swipe

Please merge.