Image shortcode and thumbnail refinements