diff --git a/apps/shared/editable_cell_table_view_controller.h b/apps/shared/editable_cell_table_view_controller.h
index 9ffc9d123..567c80213 100644
--- a/apps/shared/editable_cell_table_view_controller.h
+++ b/apps/shared/editable_cell_table_view_controller.h
@@ -22,6 +22,8 @@ public:
   void didBecomeFirstResponder() override;
 protected:
   static constexpr KDCoordinate k_cellHeight = 20;
+  static constexpr KDCoordinate k_margin = Metric::TableSeparatorThickness;
+  static constexpr KDCoordinate k_scrollBarMargin = Metric::CommonRightMargin;
   /* Editable cell might be not wide enough to display
    * LargeNumberOfSignificantDigits, we update the buffer to the column width. */
   size_t cellBufferSize(int i) {
diff --git a/apps/shared/store_controller.h b/apps/shared/store_controller.h
index b1ce27d35..1e96bb918 100644
--- a/apps/shared/store_controller.h
+++ b/apps/shared/store_controller.h
@@ -60,8 +60,6 @@ protected:
   // Responder
   void didBecomeFirstResponder() override;
   private:
-    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; }
     View * subviewAtIndex(int index) override;
diff --git a/apps/shared/values_controller.cpp b/apps/shared/values_controller.cpp
index fa3d1d587..c9dce09b2 100644
--- a/apps/shared/values_controller.cpp
+++ b/apps/shared/values_controller.cpp
@@ -17,10 +17,7 @@ ValuesController::ValuesController(Responder * parentResponder, ButtonRowControl
   m_abscissaParameterController(this)
 {
   m_selectableTableView.setVerticalCellOverlap(0);
-  m_selectableTableView.setTopMargin(k_topMargin);
-  m_selectableTableView.setRightMargin(k_rightMargin);
-  m_selectableTableView.setBottomMargin(k_bottomMargin);
-  m_selectableTableView.setLeftMargin(k_leftMargin);
+  m_selectableTableView.setMargins(k_margin, k_scrollBarMargin, k_scrollBarMargin, k_margin);
   m_selectableTableView.setBackgroundColor(Palette::WallScreenDark);
 }
 
diff --git a/apps/shared/values_controller.h b/apps/shared/values_controller.h
index ec1455e7b..932507d06 100644
--- a/apps/shared/values_controller.h
+++ b/apps/shared/values_controller.h
@@ -34,10 +34,6 @@ public:
   Responder * defaultController() override;
   void viewWillAppear() override;
   void viewDidDisappear() override;
-  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;