Use chevron icons for left/right
Merge remote-tracking branch 'template/master'