diff --git a/frontend/uxbox/shapes.cljs b/frontend/uxbox/shapes.cljs
index 94e05e401..582d4c78a 100644
--- a/frontend/uxbox/shapes.cljs
+++ b/frontend/uxbox/shapes.cljs
@@ -6,7 +6,12 @@
     (:type shape)))
 
 (defmethod render :builtin/icon
-  [shape & [{:keys [width height] :or {width "500" height "500"}}]]
-  (let [content (:svg shape)]
+  [{:keys [data width height view-box]} & [attrs]]
+  (let [attrs (merge
+               (when width {:width width})
+               (when height {:height height})
+               (when view-box {:viewBox (apply str (interpose " " view-box))})
+               attrs)]
+
     (html
-     [:svg {:width width :height height} content])))
+     [:svg attrs data])))