2.3.1 update icon trouble

Hey guys, I know you are bombarded with this but after the 2.3.1 enfold update I am having a problem with my icons in the child theme.
I have emptied cash fully, and my site is http://jackandaddi.com/ for reference to view issue.

Ok so were the problem is for me, as I gather is in the iconbox.php file. I like many others like the icon itself to be a link vs just the h3 tag in icon boxes. to change this in my child theme, through your help we have done the following.

added this to my child functions.php file so we can edit the shortcode php files.

/* makes it so i can copy and modify parent shortcode files into the shortcodes directory in my child theme*/
add_filter('avia_load_shortcodes', 'avia_include_shortcode_template', 15, 1);
function avia_include_shortcode_template($paths)
{
	$template_url = get_stylesheet_directory();
    array_unshift($paths, $template_url.'/shortcodes/');

	return $paths;
}

then in child directory added shortcodes folder and placed the iconbox.php file in there. The change made that worked BEFORE the 2.3.1 update was to delete code:

$output .= ' <div class="iconbox_icon heading-color" '.$display_char.'></div>';

and replace with following code:

if(!empty($link))
				{
					$output .= "<a href='$link' title='".esc_attr($title)."' $linktarget>";
					$output .= '<div class="iconbox_icon heading-color avia-font-'.$font.'">'.$display_char.'</div>';
					$output .= '</a>';
				}
				else
				{
					$output .= '<div class="iconbox_icon heading-color avia-font-'.$font.'">'.$display_char.'</div>';
				}

This worked beautifully then, but I see that the iconbox.php file has been altered heavily and If I replace the old iconbox file with the new one and append that same line of code then all the icons on the site disapear and show code text in its place.

Please advise how to IN THE NEW iconbox.php file make the icons themselves serve as a clickable link instead of only the default h3

thanks