diff --git a/apps/shared/store_controller.h b/apps/shared/store_controller.h
index d8d470b48..b1ce27d35 100644
--- a/apps/shared/store_controller.h
+++ b/apps/shared/store_controller.h
@@ -60,7 +60,7 @@ protected:
   // Responder
   void didBecomeFirstResponder() override;
   private:
-    static constexpr KDCoordinate k_margin = 5;
+    static constexpr KDCoordinate k_margin = Metric::TableSeparatorThickness;
     static constexpr KDCoordinate k_scrollBarMargin = Metric::CommonRightMargin;
     static constexpr KDCoordinate k_formulaInputHeight = 31;
     int numberOfSubviews() const override { return 1 + m_displayFormulaInputView; }
diff --git a/apps/shared/values_controller.h b/apps/shared/values_controller.h
index 28017e5b7..feab20f7b 100644
--- a/apps/shared/values_controller.h
+++ b/apps/shared/values_controller.h
@@ -34,10 +34,10 @@ public:
   Responder * defaultController() override;
   void viewWillAppear() override;
   void viewDidDisappear() override;
-  static constexpr KDCoordinate k_topMargin = 10;
-  static constexpr KDCoordinate k_bottomMargin = 15;
-  static constexpr KDCoordinate k_leftMargin = 1;
-  static constexpr KDCoordinate k_rightMargin = 15;
+  static constexpr KDCoordinate k_topMargin = Metric::CommonSmallMargin;
+  static constexpr KDCoordinate k_bottomMargin = Metric::CommonSmallMargin;
+  static constexpr KDCoordinate k_leftMargin = Metric::CommonSmallMargin;
+  static constexpr KDCoordinate k_rightMargin = Metric::CommonRightMargin;
   static constexpr KDCoordinate k_abscissaCellWidth = 100;
   static constexpr KDCoordinate k_ordinateCellWidth = 100;