Added icons to links in sidebar menu
fixed merge coflict