diff --git a/CHANGES.md b/CHANGES.md
index cbf13bd8a..0527a11a6 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -2,7 +2,12 @@
 
 ## Next
 
-- ...
+### New features
+
+- Add images lock proportions by default
+- Shows a pixel grid when zoom greater than 800%
+
+### Bug fixed
 
 ## 1.1.0-alpha
 
diff --git a/frontend/src/app/main/data/workspace/grid.cljs b/frontend/src/app/main/data/workspace/grid.cljs
index feacd4fbf..0b8a9bd82 100644
--- a/frontend/src/app/main/data/workspace/grid.cljs
+++ b/frontend/src/app/main/data/workspace/grid.cljs
@@ -22,7 +22,7 @@
 (defonce ^:private default-square-params
   {:size 16
    :color {:color "#59B9E2"
-           :opacity 0.2}})
+           :opacity 0.4}})
 
 (defonce ^:private default-layout-params
   {:size 12
diff --git a/frontend/src/app/main/ui/workspace/viewport.cljs b/frontend/src/app/main/ui/workspace/viewport.cljs
index d6deeb4c9..0d7f2d6af 100644
--- a/frontend/src/app/main/ui/workspace/viewport.cljs
+++ b/frontend/src/app/main/ui/workspace/viewport.cljs
@@ -231,6 +231,27 @@
                       :shape (gsh/transform-shape shape)
                       :color color}])])))
 
+(mf/defc pixel-grid
+  [{:keys [vbox zoom]}]
+  [:g.pixel-grid
+   [:defs
+    [:pattern {:id "pixel-grid"
+               :viewBox "0 0 1 1"
+               :width 1
+               :height 1
+               :pattern-units "userSpaceOnUse"}
+     [:path {:d "M 1 0 L 0 0 0 1"
+             :style {:fill "none"
+                     :stroke "#59B9E2"
+                     :stroke-opacity "0.2"
+                     :stroke-width (str (/ 1 zoom))}}]]]
+   [:rect {:x (:x vbox)
+           :y (:y vbox)
+           :width (:width vbox)
+           :height (:height vbox)
+           :fill (str "url(#pixel-grid)")
+           :style {:pointer-events "none"}}]])
+
 (mf/defc frames
   {::mf/wrap [mf/memo]
    ::mf/wrap-props false}
@@ -779,6 +800,10 @@
        (when show-grids?
          [:& frame-grid {:zoom zoom}])
 
+       (when (>= zoom 8)
+         [:& pixel-grid {:vbox vbox
+                         :zoom zoom}])
+
        (when show-snap-points?
          [:& snap-points {:layout layout
                           :transform transform