diff --git a/lib/svg_sprite.rb b/lib/svg_sprite.rb
index f9cb3ba9bb..8792dde4ab 100644
--- a/lib/svg_sprite.rb
+++ b/lib/svg_sprite.rb
@@ -269,6 +269,13 @@ module SvgSprite
       end
   end
 
+  def self.core_svgs
+    @core_svgs ||=
+      core_svg_sprites.reduce({}) do |symbols, item|
+        symbols.merge!(symbols_for(*item.values_at(:filename, :sprite), strict: true))
+      end
+  end
+
   # Just used in tests
   def self.clear_plugin_svg_sprite_cache!
     @plugin_svg_sprites = nil
@@ -362,14 +369,6 @@ module SvgSprite
     sprites
   end
 
-  def self.core_svgs
-    @core_svgs ||=
-      CORE_SVG_SPRITES.reduce({}) do |symbols, filename|
-        svg_filename = "#{File.basename(filename, ".svg")}"
-        symbols.merge!(symbols_for(svg_filename, File.open(filename), strict: true))
-      end
-  end
-
   def self.bundle(theme_id = nil)
     icons = all_icons(theme_id)