diff --git a/apps/graph/function_title_cell.cpp b/apps/graph/function_title_cell.cpp
index 3bf239b36..e4036acb5 100644
--- a/apps/graph/function_title_cell.cpp
+++ b/apps/graph/function_title_cell.cpp
@@ -42,7 +42,7 @@ View * FunctionTitleCell::subviewAtIndex(int index) {
 void FunctionTitleCell::layoutSubviews() {
   KDRect textFrame(0, k_colorIndicatorThickness, bounds().width(), bounds().height() - k_colorIndicatorThickness);
   if (m_orientation == Orientation::VerticalIndicator){
-    textFrame = KDRect(k_colorIndicatorThickness, 0, bounds().width() - k_colorIndicatorThickness, bounds().height());
+    textFrame = KDRect(k_colorIndicatorThickness, 0, bounds().width() - k_colorIndicatorThickness, bounds().height()-k_separatorThickness);
   }
   m_bufferTextView.setFrame(textFrame);
 }
diff --git a/apps/sequence/sequence_title_cell.cpp b/apps/sequence/sequence_title_cell.cpp
index 48968194b..3f86911d0 100644
--- a/apps/sequence/sequence_title_cell.cpp
+++ b/apps/sequence/sequence_title_cell.cpp
@@ -43,7 +43,7 @@ View * SequenceTitleCell::subviewAtIndex(int index) {
 void SequenceTitleCell::layoutSubviews() {
   KDRect textFrame(0, k_colorIndicatorThickness, bounds().width(), bounds().height() - k_colorIndicatorThickness);
   if (m_orientation == Orientation::VerticalIndicator){
-    textFrame = KDRect(k_colorIndicatorThickness, 0, bounds().width() - k_colorIndicatorThickness, bounds().height());
+    textFrame = KDRect(k_colorIndicatorThickness, 0, bounds().width() - k_colorIndicatorThickness, bounds().height()-k_separatorThickness);
   }
   m_titleTextView.setFrame(textFrame);
 }
diff --git a/apps/shared/function_expression_cell.cpp b/apps/shared/function_expression_cell.cpp
index 349b0f223..057f75c89 100644
--- a/apps/shared/function_expression_cell.cpp
+++ b/apps/shared/function_expression_cell.cpp
@@ -39,13 +39,16 @@ View * FunctionExpressionCell::subviewAtIndex(int index) {
 }
 
 void FunctionExpressionCell::layoutSubviews() {
-  KDRect expressionFrame(k_separatorThickness, 0, bounds().width() - k_separatorThickness, bounds().height());
+  KDRect expressionFrame(k_separatorThickness, 0, bounds().width() - k_separatorThickness, bounds().height()-k_separatorThickness);
   m_expressionView.setFrame(expressionFrame);
 }
 
 void FunctionExpressionCell::drawRect(KDContext * ctx, KDRect rect) const {
-  // Color the separator
+  KDColor separatorColor = m_even ? Palette::WallScreen : KDColorWhite;
+  // Color the vertical separator
   ctx->fillRect(KDRect(0, 0, k_separatorThickness, bounds().height()), Palette::GreyBright);
+  // Color the horizontal separator
+  ctx->fillRect(KDRect(k_separatorThickness, bounds().height()-k_separatorThickness, bounds().width()-k_separatorThickness, k_separatorThickness), separatorColor);
 }
 
 }
diff --git a/apps/shared/function_title_cell.cpp b/apps/shared/function_title_cell.cpp
index 29e62e68f..495d8008c 100644
--- a/apps/shared/function_title_cell.cpp
+++ b/apps/shared/function_title_cell.cpp
@@ -20,6 +20,9 @@ void FunctionTitleCell::drawRect(KDContext * ctx, KDRect rect) const {
   } else {
     ctx->fillRect(KDRect(0, 0, bounds().width(), k_colorIndicatorThickness), m_functionColor);
   }
+  KDColor separatorColor = m_even ? Palette::WallScreen : KDColorWhite;
+  // Color the horizontal separator
+  ctx->fillRect(KDRect(k_colorIndicatorThickness, bounds().height()-k_separatorThickness, bounds().width()-k_colorIndicatorThickness, k_separatorThickness), separatorColor);
 }
 
 }
diff --git a/apps/shared/function_title_cell.h b/apps/shared/function_title_cell.h
index ffe628bf7..eba48301e 100644
--- a/apps/shared/function_title_cell.h
+++ b/apps/shared/function_title_cell.h
@@ -15,6 +15,7 @@ public:
   virtual void setColor(KDColor color);
   void drawRect(KDContext * ctx, KDRect rect) const override;
 protected:
+  constexpr static KDCoordinate k_separatorThickness = 1;
   constexpr static KDCoordinate k_colorIndicatorThickness = 2;
   Orientation m_orientation;
 private: