Merged and squashed mp_frontend_icons_in_the_backend

Conflicts:
	app/views/layouts/app_admin.html.haml