diff --git a/frontend/resources/styles/main/partials/viewer.scss b/frontend/resources/styles/main/partials/viewer.scss
index 15f3fd48d..eeac272b2 100644
--- a/frontend/resources/styles/main/partials/viewer.scss
+++ b/frontend/resources/styles/main/partials/viewer.scss
@@ -17,4 +17,9 @@
   display: flex;
   justify-content: center;
   align-items: center;
+  flex-flow: wrap;
+
+  svg {
+    transform-origin: center;
+  }
 }
diff --git a/frontend/src/uxbox/main/ui/viewer/thumbnails.cljs b/frontend/src/uxbox/main/ui/viewer/thumbnails.cljs
index bf830a853..0920919b1 100644
--- a/frontend/src/uxbox/main/ui/viewer/thumbnails.cljs
+++ b/frontend/src/uxbox/main/ui/viewer/thumbnails.cljs
@@ -86,13 +86,12 @@
                      (gmt/translate-matrix))
         frame (assoc frame :displacement-modifier modifier)
 
-        transform (str "scale(" zoom ")")]
-
+        width (* (:width frame) zoom)
+        height (* (:height frame) zoom)]
 
     [:svg {:view-box (str "0 0 " (:width frame 0) " " (:height frame 0))
-           :width (:width frame)
-           :height (:height frame)
-           :transform transform
+           :width width
+           :height height
            :version "1.1"
            :xmlnsXlink "http://www.w3.org/1999/xlink"
            :xmlns "http://www.w3.org/2000/svg"}