Starting to work with custom icons. This commit is still working without.