adding tlp, hash, icons
fixing merge