Some icon management (vol 2) + DB updated