[Fix bug 896469] Add thimble logo back to header, adjust spacing, fix some overrides