Merge branch '384-bug-header-title-in-settings-moves-up' into 'master'

Gets rid of hidden icon in back button header

Closes #384

See merge request bloodyhealth/drip!227