The goal is to make the icons more generic, please see individual commits for details
See also !244 (merged)