@@ -536,15 +536,20 @@ function wp_get_tooltip_helper( $content, $args = array() ) {
 	if ( 'tooltip' === $args['type'] ) {
 		// Tooltips are only used to visually display labels.
 		$label  = wp_strip_all_tags( $content, true );
-		$markup = sprintf(
-			'<span class="%1$s">%6$s<span popover="hint" id="%2$s" class="wp-tooltip__bubble" role="tooltip">' .
-			'<span id="%2$s-text" class="wp-tooltip__text">%5$s</span>' .
+		if ( is_string( $button ) ) {
+			$button = str_replace(
+				array( '%1$s', '%2$s', '%3$s', '%4$s' ),
+				array( esc_attr( $classes ), esc_attr( $id ), esc_attr( $label ), esc_attr( $icon ) ),
+				$button
+			);
+		}
+    	$markup = sprintf(
+			'<span class="%1$s">%4$s<span popover="hint" id="%2$s" class="wp-tooltip__bubble" role="tooltip">' .
+			'<span id="%2$s-text" class="wp-tooltip__text">%3$s</span>' .
 			'</span>' .
 			'</span>',
 			esc_attr( $classes ),
 			esc_attr( $id ),
-			esc_attr( $label ),
-			esc_attr( $icon ),
 			esc_html( $content ),
 			$button
 		);