Change sidebar icons
FIx merge
Git problems