diff --git a/apps/graph/Makefile b/apps/graph/Makefile
index d41986df9..c1f2d8210 100644
--- a/apps/graph/Makefile
+++ b/apps/graph/Makefile
@@ -1,6 +1,5 @@
 app_objs += $(addprefix apps/graph/,\
   app.o\
-  even_odd_cell.o\
   evaluate_context.o\
   function.o\
   function_store.o\
diff --git a/apps/graph/function_title_cell.h b/apps/graph/function_title_cell.h
index 330e05979..b9e751c92 100644
--- a/apps/graph/function_title_cell.h
+++ b/apps/graph/function_title_cell.h
@@ -2,7 +2,6 @@
 #define GRAPH_FUNCTION_TITLE_CELL_H
 
 #include <escher.h>
-#include "even_odd_cell.h"
 
 namespace Graph {
 class FunctionTitleCell : public EvenOddCell {
diff --git a/apps/graph/list/function_expression_view.h b/apps/graph/list/function_expression_view.h
index df54632b0..de5e4205f 100644
--- a/apps/graph/list/function_expression_view.h
+++ b/apps/graph/list/function_expression_view.h
@@ -2,7 +2,6 @@
 #define GRAPH_FUNCTION_EXPRESSION_H
 
 #include <escher.h>
-#include "../even_odd_cell.h"
 #include "../function.h"
 
 namespace Graph {
diff --git a/apps/graph/list/new_function_cell.h b/apps/graph/list/new_function_cell.h
index 5340a2978..52661d384 100644
--- a/apps/graph/list/new_function_cell.h
+++ b/apps/graph/list/new_function_cell.h
@@ -2,7 +2,6 @@
 #define GRAPH_NEW_FUNCTION_CELL_H
 
 #include <escher.h>
-#include "../even_odd_cell.h"
 
 namespace Graph {
 class NewFunctionCell : public EvenOddCell {
diff --git a/apps/graph/values/title_cell.h b/apps/graph/values/title_cell.h
index 1c370ab2a..83af544b1 100644
--- a/apps/graph/values/title_cell.h
+++ b/apps/graph/values/title_cell.h
@@ -2,7 +2,6 @@
 #define GRAPH_TITLE_CELL_H
 
 #include <escher.h>
-#include "../even_odd_cell.h"
 
 namespace Graph {
 class TitleCell : public EvenOddCell {
diff --git a/apps/graph/values/value_cell.h b/apps/graph/values/value_cell.h
index 5a94027f0..0f5216441 100644
--- a/apps/graph/values/value_cell.h
+++ b/apps/graph/values/value_cell.h
@@ -3,7 +3,6 @@
 
 #include <escher.h>
 #include <poincare.h>
-#include "../even_odd_cell.h"
 
 namespace Graph {
 class ValueCell : public EvenOddCell {
diff --git a/escher/Makefile b/escher/Makefile
index 4c3f8c8aa..4127e88b8 100644
--- a/escher/Makefile
+++ b/escher/Makefile
@@ -5,8 +5,9 @@ objs += $(addprefix escher/src/,\
   buffer_text_view.o\
   button.o\
   container.o\
-  header_view_controller.o\
+  even_odd_cell.o\
   expression_view.o\
+  header_view_controller.o\
   image_view.o\
   invocation.o\
   input_view_controller.o\
diff --git a/escher/include/escher.h b/escher/include/escher.h
index 9a8887593..cac0e7fcd 100644
--- a/escher/include/escher.h
+++ b/escher/include/escher.h
@@ -5,8 +5,9 @@
 #include <escher/buffer_text_view.h>
 #include <escher/button.h>
 #include <escher/container.h>
-#include <escher/header_view_controller.h>
+#include <escher/even_odd_cell.h>
 #include <escher/expression_view.h>
+#include <escher/header_view_controller.h>
 #include <escher/image.h>
 #include <escher/image_view.h>
 #include <escher/input_view_controller.h>
diff --git a/apps/graph/even_odd_cell.h b/escher/include/escher/even_odd_cell.h
similarity index 81%
rename from apps/graph/even_odd_cell.h
rename to escher/include/escher/even_odd_cell.h
index 472b4a70e..b4fd54838 100644
--- a/apps/graph/even_odd_cell.h
+++ b/escher/include/escher/even_odd_cell.h
@@ -1,9 +1,7 @@
-#ifndef GRAPH_EVEN_ODD_CELL_H
-#define GRAPH_EVEN_ODD_CELL_H
+#ifndef ESCHER_EVEN_ODD_CELL_H
+#define ESCHER_EVEN_ODD_CELL_H
 
-#include <escher.h>
-
-namespace Graph {
+#include <escher/table_view_cell.h>
 
 class EvenOddCell : public TableViewCell {
 public:
@@ -20,6 +18,4 @@ private:
   bool m_even;
 };
 
-}
-
 #endif
diff --git a/apps/graph/even_odd_cell.cpp b/escher/src/even_odd_cell.cpp
similarity index 94%
rename from apps/graph/even_odd_cell.cpp
rename to escher/src/even_odd_cell.cpp
index ffd590b9a..166876cba 100644
--- a/apps/graph/even_odd_cell.cpp
+++ b/escher/src/even_odd_cell.cpp
@@ -1,6 +1,4 @@
-#include "even_odd_cell.h"
-
-namespace Graph {
+#include <escher/even_odd_cell.h>
 
 constexpr KDColor EvenOddCell::k_evenLineBackgroundColor;
 constexpr KDColor EvenOddCell::k_oddLineBackgroundColor;
@@ -28,5 +26,3 @@ void EvenOddCell::drawRect(KDContext * ctx, KDRect rect) const {
   KDColor background = backgroundColor();
   ctx->fillRect(rect, background);
 }
-
-}