Merge changes Ia06b0f7f,I144c106b

* changes:
  Update file icons and types fetching logic
  Handle invalid log messages in protolog