Added icons to sidebar / Changed some colors
Merge branch 'sapns__sidebar_with_icons' into master2