diff --git a/backend/src/app/media.clj b/backend/src/app/media.clj
index 59019558d..22075a643 100644
--- a/backend/src/app/media.clj
+++ b/backend/src/app/media.clj
@@ -13,7 +13,7 @@
    [app.common.spec :as us]
    [app.config :as cf]
    [app.rlimits :as rlm]
-   [app.rpc.queries.svg :as svg]
+   [app.util.svg :as svg]
    [buddy.core.bytes :as bb]
    [buddy.core.codecs :as bc]
    [clojure.java.io :as io]
@@ -180,7 +180,7 @@
   (us/assert ::input input)
   (let [{:keys [path mtype]} input]
     (if (= mtype "image/svg+xml")
-      (let [info (some-> path slurp svg/parse get-basic-info-from-svg)]
+      (let [info (some-> path slurp svg/pre-process svg/parse get-basic-info-from-svg)]
         (when-not info
           (ex/raise :type :validation
                     :code :invalid-svg-file
diff --git a/backend/src/app/rpc.clj b/backend/src/app/rpc.clj
index 49b4ff809..6426116d0 100644
--- a/backend/src/app/rpc.clj
+++ b/backend/src/app/rpc.clj
@@ -149,8 +149,7 @@
                      'app.rpc.queries.comments
                      'app.rpc.queries.profile
                      'app.rpc.queries.viewer
-                     'app.rpc.queries.fonts
-                     'app.rpc.queries.svg)
+                     'app.rpc.queries.fonts)
          (map (partial process-method cfg))
          (into {}))))
 
diff --git a/backend/src/app/rpc/mutations/fonts.clj b/backend/src/app/rpc/mutations/fonts.clj
index a766265c6..b9682dad2 100644
--- a/backend/src/app/rpc/mutations/fonts.clj
+++ b/backend/src/app/rpc/mutations/fonts.clj
@@ -9,14 +9,12 @@
    [app.common.exceptions :as ex]
    [app.common.spec :as us]
    [app.common.uuid :as uuid]
-   [app.config :as cf]
    [app.db :as db]
    [app.media :as media]
    [app.rpc.queries.teams :as teams]
    [app.storage :as sto]
    [app.util.services :as sv]
    [app.util.time :as dt]
-   [app.worker :as wrk]
    [clojure.spec.alpha :as s]))
 
 (declare create-font-variant)
diff --git a/backend/src/app/rpc/queries/svg.clj b/backend/src/app/util/svg.clj
similarity index 79%
rename from backend/src/app/rpc/queries/svg.clj
rename to backend/src/app/util/svg.clj
index 63c0b8aeb..9c3aab795 100644
--- a/backend/src/app/rpc/queries/svg.clj
+++ b/backend/src/app/util/svg.clj
@@ -4,13 +4,10 @@
 ;;
 ;; Copyright (c) UXBOX Labs SL
 
-(ns app.rpc.queries.svg
+(ns app.util.svg
   (:require
    [app.common.exceptions :as ex]
-   [app.common.spec :as us]
-   [app.util.logging :as l]
-   [app.util.services :as sv]
-   [clojure.spec.alpha :as s]
+   [app.common.logging :as l]
    [clojure.xml :as xml]
    [cuerdas.core :as str])
   (:import
@@ -39,14 +36,6 @@
                 :hint "invalid svg file"
                 :cause e))))
 
-(declare pre-process)
-
-(s/def ::data ::us/string)
-(s/def ::parsed-svg (s/keys :req-un [::data]))
-
-(sv/defmethod ::parsed-svg
-  [_ {:keys [data] :as params}]
-  (->> data pre-process parse))
 
 ;; --- PROCESSORS