Revert "Added header"

This reverts commit 6bda4e67ed29d6a2cb9850aaa8aa29e813f8b3e9.
Fixed back header
Fixed some icon loading
Merge remote-tracking branch 'upstream/master'