diff --git a/lib/simplecov-shield.rb b/lib/simplecov-shield.rb
index 04037e4..2df0d52 100644
--- a/lib/simplecov-shield.rb
+++ b/lib/simplecov-shield.rb
@@ -25,10 +25,10 @@ def generate_shield
   end
 
   def shield_url
-    url = "#{SHIELD_ROOT}/#{badge_name}-#{coverage_percent}%-#{color}.svg"
+    url = "#{SHIELD_ROOT}/#{ERB::Util.url_encode("#{badge_name}-#{coverage_percent}%-#{color}")}.svg"
     url += "?style=#{style}" if STYLES.include? style
 
-    URI.encode(url)
+    url
   end
 
   def coverage_percent
@@ -58,4 +58,4 @@ def color
   @config.each do |key, val|
     define_method(key) { self.class.config[key] }
   end
-end
\ No newline at end of file
+end
diff --git a/spec/assets/coverage-flat.svg b/spec/assets/coverage-flat.svg
index 08ae50f..efd0328 100644
--- a/spec/assets/coverage-flat.svg
+++ b/spec/assets/coverage-flat.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="117" height="20"><linearGradient id="a" x2="0" y2="100%"><stop offset="0" stop-color="#fff" stop-opacity=".1"/><stop offset=".1" stop-color="#fff" stop-opacity=".1"/><stop offset=".9" stop-color="#fff" stop-opacity=".1"/><stop offset="1" stop-color="#fff" stop-opacity=".1"/></linearGradient><path fill="#555" d="M0 0h117v20h-117z"/><path fill="#4c1" d="M63 0h54v20h-54zM63 0h4v20h-4z"/><path fill="url(#a)" d="M0 0h117v20h-117z"/><g fill="#fff" text-anchor="middle" font-family="DejaVu Sans,Verdana,Geneva,sans-serif" font-size="11"><text x="32.5" y="13">coverage</text><text x="89" y="13">93.13%</text></g></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="114" height="20" role="img" aria-label="coverage: 93.13%"><title>coverage: 93.13%</title><g shape-rendering="crispEdges"><rect width="61" height="20" fill="#555"/><rect x="61" width="53" height="20" fill="#4c1"/></g><g fill="#fff" text-anchor="middle" font-family="Verdana,Geneva,DejaVu Sans,sans-serif" text-rendering="geometricPrecision" font-size="110"><text x="315" y="140" transform="scale(.1)" fill="#fff" textLength="510">coverage</text><text x="865" y="140" transform="scale(.1)" fill="#fff" textLength="430">93.13%</text></g></svg>
\ No newline at end of file
diff --git a/spec/assets/coverage.svg b/spec/assets/coverage.svg
index 1311637..0518aa9 100644
--- a/spec/assets/coverage.svg
+++ b/spec/assets/coverage.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="99" height="18"><linearGradient id="a" x2="0" y2="100%"><stop offset="0" stop-color="#fff" stop-opacity=".7"/><stop offset=".1" stop-color="#aaa" stop-opacity=".1"/><stop offset=".9" stop-opacity=".3"/><stop offset="1" stop-opacity=".5"/></linearGradient><rect rx="4" width="99" height="18" fill="#555"/><rect rx="4" x="63" width="36" height="18" fill="#4c1"/><path fill="#4c1" d="M63 0h4v18h-4z"/><rect rx="4" width="99" height="18" fill="url(#a)"/><g fill="#fff" text-anchor="middle" font-family="DejaVu Sans,Verdana,Geneva,sans-serif" font-size="11"><text x="32.5" y="13" fill="#010101" fill-opacity=".3">coverage</text><text x="32.5" y="12">coverage</text><text x="80" y="13" fill="#010101" fill-opacity=".3">97%</text><text x="80" y="12">97%</text></g></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="96" height="20" role="img" aria-label="coverage: 97%"><title>coverage: 97%</title><linearGradient id="s" x2="0" y2="100%"><stop offset="0" stop-color="#bbb" stop-opacity=".1"/><stop offset="1" stop-opacity=".1"/></linearGradient><clipPath id="r"><rect width="96" height="20" rx="3" fill="#fff"/></clipPath><g clip-path="url(#r)"><rect width="61" height="20" fill="#555"/><rect x="61" width="35" height="20" fill="#4c1"/><rect width="96" height="20" fill="url(#s)"/></g><g fill="#fff" text-anchor="middle" font-family="Verdana,Geneva,DejaVu Sans,sans-serif" text-rendering="geometricPrecision" font-size="110"><text aria-hidden="true" x="315" y="150" fill="#010101" fill-opacity=".3" transform="scale(.1)" textLength="510">coverage</text><text x="315" y="140" transform="scale(.1)" fill="#fff" textLength="510">coverage</text><text aria-hidden="true" x="775" y="150" fill="#010101" fill-opacity=".3" transform="scale(.1)" textLength="250">97%</text><text x="775" y="140" transform="scale(.1)" fill="#fff" textLength="250">97%</text></g></svg>
\ No newline at end of file