Changing icon
Another refactor, this time at database classes