fixet burger icon
Merge conflicts