diff --git a/frontend/src/uxbox/main/data/shapes.cljs b/frontend/src/uxbox/main/data/shapes.cljs
index c202d8252c..e8cd0546d3 100644
--- a/frontend/src/uxbox/main/data/shapes.cljs
+++ b/frontend/src/uxbox/main/data/shapes.cljs
@@ -333,7 +333,7 @@
   udp/IPageUpdate
   ptk/UpdateEvent
   (update [_ state]
-    (assoc-in state [:shapes id :proportion-lock] true)))
+    (assoc-in state [:shapes id :proportion-lock] false)))
 
 (defn unlock-proportions
   [id]
diff --git a/frontend/src/uxbox/main/ui/workspace/sidebar/options/circle_measures.cljs b/frontend/src/uxbox/main/ui/workspace/sidebar/options/circle_measures.cljs
index 7f90d1a040..aa802f464a 100644
--- a/frontend/src/uxbox/main/ui/workspace/sidebar/options/circle_measures.cljs
+++ b/frontend/src/uxbox/main/ui/workspace/sidebar/options/circle_measures.cljs
@@ -63,7 +63,7 @@
        [:div.lock-size
         {:class (when (:proportion-lock shape) "selected")
          :on-click on-proportion-lock-change}
-        i/lock]
+        (if (:proportion-lock shape) i/lock i/unlock)]
        [:div.input-element.pixels
         [:input.input-text
          {:placeholder "Height"
diff --git a/frontend/src/uxbox/main/ui/workspace/sidebar/options/icon_measures.cljs b/frontend/src/uxbox/main/ui/workspace/sidebar/options/icon_measures.cljs
index adb9494a37..5635f2b882 100644
--- a/frontend/src/uxbox/main/ui/workspace/sidebar/options/icon_measures.cljs
+++ b/frontend/src/uxbox/main/ui/workspace/sidebar/options/icon_measures.cljs
@@ -64,7 +64,7 @@
           [:div.lock-size
            {:class (when (:proportion-lock shape) "selected")
             :on-click on-proportion-lock-change}
-           i/lock]
+           (if (:proportion-lock shape) i/lock i/unlock)]
           [:div.input-element.pixels
            [:input.input-text
             {:placeholder "Height"
diff --git a/frontend/src/uxbox/main/ui/workspace/sidebar/options/rect_measures.cljs b/frontend/src/uxbox/main/ui/workspace/sidebar/options/rect_measures.cljs
index 98054a4a3b..fa3ad027bc 100644
--- a/frontend/src/uxbox/main/ui/workspace/sidebar/options/rect_measures.cljs
+++ b/frontend/src/uxbox/main/ui/workspace/sidebar/options/rect_measures.cljs
@@ -58,7 +58,7 @@
          [:div.lock-size
           {:class (when (:proportion-lock shape) "selected")
            :on-click on-proportion-lock-change}
-          i/lock]
+           (if (:proportion-lock shape) i/lock i/unlock)]
          [:div.input-element.pixels
           [:input.input-text
            {:placeholder "Height"