Fix how $XDG_DATA_HOME is resolved when not explicitly set
Fix formation of icon path names from $XDG_DATA_DIRS