Cleanup, Good for 2.0, Added shortcode for east font icons