diff --git a/apps/regression/store_controller.cpp b/apps/regression/store_controller.cpp
index 786b79bd7..8102cdc75 100644
--- a/apps/regression/store_controller.cpp
+++ b/apps/regression/store_controller.cpp
@@ -41,7 +41,7 @@ void StoreController::willDisplayCellAtLocation(HighlightCell * cell, int i, int
   }
   Shared::StoreTitleCell * mytitleCell = static_cast<Shared::StoreTitleCell *>(cell);
   bool isValuesColumn = i%Store::k_numberOfColumnsPerSeries == 0;
-  mytitleCell->setSeparatorLeft(isValuesColumn);
+  mytitleCell->setSeparatorLeft(isValuesColumn && i > 0);
   int seriesIndex = i/Store::k_numberOfColumnsPerSeries;
   mytitleCell->setColor(m_store->numberOfPairsOfSeries(seriesIndex) == 0 ? Palette::GreyDark : Store::colorOfSeriesAtIndex(seriesIndex)); // TODO Share GreyDark with graph/list_controller and statistics/store_controller
   char name[] = {isValuesColumn ? 'X' : 'Y', static_cast<char>('1' + seriesIndex), 0};
diff --git a/apps/shared/store_controller.cpp b/apps/shared/store_controller.cpp
index 9cfbb51bb..447749bf6 100644
--- a/apps/shared/store_controller.cpp
+++ b/apps/shared/store_controller.cpp
@@ -148,7 +148,7 @@ int StoreController::typeAtLocation(int i, int j) {
 void StoreController::willDisplayCellAtLocation(HighlightCell * cell, int i, int j) {
   // Handle the separator
   if (typeAtLocation(i, j) == k_editableCellType) {
-    bool shouldHaveLeftSeparator = i % DoublePairStore::k_numberOfColumnsPerSeries == 0;
+    bool shouldHaveLeftSeparator = i > 0 && ( i % DoublePairStore::k_numberOfColumnsPerSeries == 0);
     static_cast<StoreCell *>(cell)->setSeparatorLeft(shouldHaveLeftSeparator);
   }
   // Handle hidden cells
diff --git a/apps/shared/store_controller.h b/apps/shared/store_controller.h
index d5c0de1df..d8d470b48 100644
--- a/apps/shared/store_controller.h
+++ b/apps/shared/store_controller.h
@@ -46,8 +46,6 @@ public:
 
 protected:
   static constexpr KDCoordinate k_cellWidth = 116;
-  static constexpr KDCoordinate k_margin = 8;
-  static constexpr KDCoordinate k_scrollBarMargin = Metric::CommonRightMargin;
   constexpr static int k_maxNumberOfEditableCells = (Ion::Display::Width/k_cellWidth+2) * ((Ion::Display::Height - Metric::TitleBarHeight - Metric::TabHeight)/k_cellHeight+2);
   constexpr static int k_numberOfTitleCells = 4;
   static constexpr int k_titleCellType = 0;
@@ -62,7 +60,7 @@ protected:
   // Responder
   void didBecomeFirstResponder() override;
   private:
-    static constexpr KDCoordinate k_margin = 8;
+    static constexpr KDCoordinate k_margin = 5;
     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/statistics/store_controller.cpp b/apps/statistics/store_controller.cpp
index 5a4c93237..15cead9ad 100644
--- a/apps/statistics/store_controller.cpp
+++ b/apps/statistics/store_controller.cpp
@@ -44,7 +44,7 @@ void StoreController::willDisplayCellAtLocation(HighlightCell * cell, int i, int
   }
   Shared::StoreTitleCell * mytitleCell = static_cast<Shared::StoreTitleCell *>(cell);
   bool isValuesColumn = i%Store::k_numberOfColumnsPerSeries == 0;
-  mytitleCell->setSeparatorLeft(isValuesColumn);
+  mytitleCell->setSeparatorLeft(i > 0 && isValuesColumn);
   int seriesIndex = i/Store::k_numberOfColumnsPerSeries;
   assert(seriesIndex >= 0 && seriesIndex < DoublePairStore::k_numberOfSeries);
   if (isValuesColumn) {
diff --git a/escher/include/escher/metric.h b/escher/include/escher/metric.h
index 265b69d8a..2cd21db5d 100644
--- a/escher/include/escher/metric.h
+++ b/escher/include/escher/metric.h
@@ -30,7 +30,7 @@ public:
   constexpr static KDCoordinate FractionAndConjugateHorizontalOverflow = 2;
   constexpr static KDCoordinate FractionAndConjugateHorizontalMargin = 2;
   constexpr static KDCoordinate MinimalBracketAndParenthesisHeight = 18;
-  constexpr static KDCoordinate TableSeparatorThickness = 2;
+  constexpr static KDCoordinate TableSeparatorThickness = 5;
   constexpr static KDCoordinate ExpressionViewHorizontalMargin = 5;
 };