diff --git a/apps/battery_view.h b/apps/battery_view.h
index 2c311bc4a..5c1d373aa 100644
--- a/apps/battery_view.h
+++ b/apps/battery_view.h
@@ -24,7 +24,7 @@ private:
   constexpr static KDCoordinate k_batteryWidth = 15;
   constexpr static KDCoordinate k_elementWidth = 1;
   constexpr static KDCoordinate k_capHeight = 4;
-  constexpr static KDCoordinate k_separatorThickness = 1;
+  constexpr static KDCoordinate k_separatorThickness = Metric::CellSeparatorThickness;
   Ion::Battery::Charge m_chargeState;
   bool m_isCharging;
   bool m_isPlugged;
diff --git a/apps/settings/sub_menu/message_table_cell_with_editable_text_with_separator.h b/apps/settings/sub_menu/message_table_cell_with_editable_text_with_separator.h
index 932f31fc4..148da96e5 100644
--- a/apps/settings/sub_menu/message_table_cell_with_editable_text_with_separator.h
+++ b/apps/settings/sub_menu/message_table_cell_with_editable_text_with_separator.h
@@ -17,7 +17,7 @@ public:
   MessageTableCellWithEditableText * messageTableCellWithEditableText() { return &m_cell; }
   constexpr static KDCoordinate k_margin = 10;
 private:
-  constexpr static KDCoordinate k_separatorThickness = 1;
+  constexpr static KDCoordinate k_separatorThickness = Metric::CellSeparatorThickness;
   int numberOfSubviews() const override;
   View * subviewAtIndex(int index) override;
   void layoutSubviews() override;
diff --git a/apps/shared/function_expression_cell.h b/apps/shared/function_expression_cell.h
index b35b418f4..34fc1a2f1 100644
--- a/apps/shared/function_expression_cell.h
+++ b/apps/shared/function_expression_cell.h
@@ -12,7 +12,7 @@ public:
   void drawRect(KDContext * ctx, KDRect rect) const override;
   void layoutSubviews() override;
 private:
-  constexpr static KDCoordinate k_separatorThickness = 1;
+  constexpr static KDCoordinate k_separatorThickness = Metric::CellSeparatorThickness;
 };
 
 }
diff --git a/apps/shared/function_title_cell.h b/apps/shared/function_title_cell.h
index 45fc820d6..efb3480ef 100644
--- a/apps/shared/function_title_cell.h
+++ b/apps/shared/function_title_cell.h
@@ -23,7 +23,7 @@ public:
   void setBaseline(KDCoordinate baseline);
   virtual const KDFont * font() const = 0;
 protected:
-  constexpr static KDCoordinate k_separatorThickness = 1;
+  constexpr static KDCoordinate k_separatorThickness = Metric::CellSeparatorThickness;
   constexpr static KDCoordinate k_colorIndicatorThickness = 2;
   KDRect subviewFrame() const;
   float verticalAlignment() const;
diff --git a/escher/include/escher/editable_text_cell.h b/escher/include/escher/editable_text_cell.h
index 414edc1d4..438ee6e49 100644
--- a/escher/include/escher/editable_text_cell.h
+++ b/escher/include/escher/editable_text_cell.h
@@ -3,6 +3,7 @@
 
 #include <escher/responder.h>
 #include <escher/highlight_cell.h>
+#include <escher/metric.h>
 #include <escher/text_field_delegate.h>
 #include <escher/text_field.h>
 #include <poincare/print_float.h>
@@ -29,7 +30,7 @@ public:
   void didBecomeFirstResponder() override;
   KDSize minimalSizeForOptimalDisplay() const override;
 private:
-  constexpr static KDCoordinate k_separatorThickness = 1;
+  constexpr static KDCoordinate k_separatorThickness = Metric::CellSeparatorThickness;
   TextField m_textField;
   char m_textBody[Poincare::PrintFloat::k_maxFloatBufferSize];
   KDCoordinate m_topMargin;
diff --git a/escher/include/escher/expression_field.h b/escher/include/escher/expression_field.h
index b61d1eb28..0c4c1dc43 100644
--- a/escher/include/escher/expression_field.h
+++ b/escher/include/escher/expression_field.h
@@ -3,6 +3,7 @@
 
 #include <escher/layout_field.h>
 #include <escher/layout_field_delegate.h>
+#include <escher/metric.h>
 #include <escher/text_field.h>
 #include <escher/text_field_delegate.h>
 #include <poincare/layout.h>
@@ -41,7 +42,7 @@ private:
   static constexpr KDCoordinate k_textFieldHeight = 37;
   static constexpr KDCoordinate k_horizontalMargin = 5;
   static constexpr KDCoordinate k_verticalMargin = 5;
-  constexpr static int k_separatorThickness = 1;
+  constexpr static KDCoordinate k_separatorThickness = Metric::CellSeparatorThickness;
   KDCoordinate inputViewHeight() const;
   KDCoordinate maximalHeight() const;
   TextField m_textField;
diff --git a/escher/include/escher/metric.h b/escher/include/escher/metric.h
index 2cd21db5d..23d30c0dc 100644
--- a/escher/include/escher/metric.h
+++ b/escher/include/escher/metric.h
@@ -30,6 +30,7 @@ public:
   constexpr static KDCoordinate FractionAndConjugateHorizontalOverflow = 2;
   constexpr static KDCoordinate FractionAndConjugateHorizontalMargin = 2;
   constexpr static KDCoordinate MinimalBracketAndParenthesisHeight = 18;
+  constexpr static KDCoordinate CellSeparatorThickness = 1;
   constexpr static KDCoordinate TableSeparatorThickness = 5;
   constexpr static KDCoordinate ExpressionViewHorizontalMargin = 5;
 };
diff --git a/escher/include/escher/table_cell.h b/escher/include/escher/table_cell.h
index 14915ae10..0beec7046 100644
--- a/escher/include/escher/table_cell.h
+++ b/escher/include/escher/table_cell.h
@@ -2,6 +2,7 @@
 #define ESCHER_TABLE_CELL_H
 
 #include <escher/highlight_cell.h>
+#include <escher/metric.h>
 
 class TableCell : public HighlightCell {
 public:
@@ -18,7 +19,7 @@ protected:
   int numberOfSubviews() const override;
   View * subviewAtIndex(int index) override;
   void layoutSubviews() override;
-  constexpr static KDCoordinate k_separatorThickness = 1;
+  constexpr static KDCoordinate k_separatorThickness = Metric::CellSeparatorThickness;
   constexpr static KDCoordinate k_labelMargin = 10;
   constexpr static KDCoordinate k_accessoryMargin = 10;
 private: