diff --git a/core/modules/image/image.module b/core/modules/image/image.module
index b6c3ae2..47a9033 100644
--- a/core/modules/image/image.module
+++ b/core/modules/image/image.module
@@ -653,9 +653,7 @@ function image_style_url($style_name, $path, $clean_urls = NULL) {
 
   // Append the query string with the token, if necessary.
   if ($token_query) {
-    $query = drupal_get_query_array($file_url);
-    $query += $token_query;
-    $file_url = rawurldecode(drupal_http_build_query($query));
+    $file_url .= (strpos($file_url, '?') !== FALSE ? '&' : '?') . Drupal::urlGenerator()->httpBuildQuery($token_query);
   }
 
   return $file_url;