Update file icons and types fetching logic

Test: Visual
Change-Id: Ia06b0f7ffdca7fa039470ac1b4dadb759bdb5b65
2 files changed