Re-fixed the section icons, deals with legacy icons, new icons and legacy file based icons