Comfort page - back button graphic
Merge remote-tracking branch 'origin/master' into back-button