[DF-185] Fixed icons
[DF-2579] Added defines for using maps of FilePath, Object pairs
[DF-2579] Added defines for using maps of FilePath, Object pairs