Merge pull request #1269 from lakkatv/xmb

(XMB) Bugfix
Fix build - some files moved around.
(XMB) Display subsetting icons