Add Icons

Conflicts:
	Rakefile
Fix reloaddata