diff --git a/app/app.cpp b/app/app.cpp
index 54af34abd..c94c7b061 100644
--- a/app/app.cpp
+++ b/app/app.cpp
@@ -7,8 +7,8 @@ extern "C" {
 #include <poincare.h>
 
 void draw_lines_from_center() {
-  KDCoordinate width = 240;
-  KDCoordinate height = 160;
+  KDCoordinate width = SCREEN_WIDTH;
+  KDCoordinate height = SCREEN_HEIGHT;
 
   KDColor c = 0xFF;
 
@@ -36,8 +36,8 @@ void draw_lines_from_center() {
 
 void plot(Expression * e, float xMin, float xMax, float yMin, float yMax) {
   Context plotContext;
-  KDCoordinate screenWidth = 240;
-  KDCoordinate screenHeight = 160;
+  KDCoordinate screenWidth = SCREEN_WIDTH;
+  KDCoordinate screenHeight = SCREEN_HEIGHT;
   KDPoint previousPoint;
   for (KDCoordinate i=0;i<screenWidth; i++) {
     float x = xMin + (xMax-xMin)/screenWidth*i;
@@ -106,8 +106,8 @@ void interactive_expression_parsing() {
         KDRect r;
         r.x = 0;
         r.y = 0;
-        r.width = 160;
-        r.height = 160;
+        r.width = SCREEN_WIDTH;
+        r.height = SCREEN_HEIGHT;
         KDFillRect(r, 0x00);
       }
       input[index++] = character;
diff --git a/ion/include/ion/framebuffer.h b/ion/include/ion/framebuffer.h
index 1ff90ab26..348514546 100644
--- a/ion/include/ion/framebuffer.h
+++ b/ion/include/ion/framebuffer.h
@@ -5,4 +5,7 @@
 
 void ion_set_pixel(uint8_t x, uint8_t y, uint8_t color);
 
+#define SCREEN_WIDTH 320
+#define SCREEN_HEIGHT 240
+
 #endif
diff --git a/ion/src/device/display/framebuffer.h b/ion/src/device/display/framebuffer.h
index 6031330d4..84def5842 100644
--- a/ion/src/device/display/framebuffer.h
+++ b/ion/src/device/display/framebuffer.h
@@ -1,8 +1,16 @@
+#ifndef ION_DEVICE_DISPLAY_FRAMEBUFFER_H_
+#define ION_DEVICE_DISPLAY_FRAMEBUFFER_H_
+
+#include <ion.h>
+
 extern char _framebuffer_start;
 extern char _framebuffer_end;
 
 #define FRAMEBUFFER_ADDRESS (&_framebuffer_start)
 #define FRAMEBUFFER_LENGTH (&_framebuffer_end-&_framebuffer_start)
-#define FRAMEBUFFER_WIDTH 240
-#define FRAMEBUFFER_HEIGHT 160
+#define FRAMEBUFFER_WIDTH SCREEN_WIDTH
+#define FRAMEBUFFER_HEIGHT SCREEN_HEIGHT
+
 #define FRAMEBUFFER_BITS_PER_PIXEL 4
+
+#endif // ION_DEVICE_DISPLAY_FRAMEBUFFER_H_
diff --git a/ion/src/simulator/init.cpp b/ion/src/simulator/init.cpp
index a449dae66..ee18e00ae 100644
--- a/ion/src/simulator/init.cpp
+++ b/ion/src/simulator/init.cpp
@@ -16,16 +16,14 @@ static FltkLCD * sDisplay;
 static FltkKbd * sKeyboard;
 
 #define FRAMEBUFFER_ADDRESS (sDisplay->m_framebuffer)
-#define FRAMEBUFFER_WIDTH 320
-#define FRAMEBUFFER_HEIGHT 240
 #define FRAMEBUFFER_BITS_PER_PIXEL 8
 
 void init_platform() {
   Fl::visual(FL_RGB);
 
   int margin = 10;
-  int screen_width = FRAMEBUFFER_WIDTH;
-  int screen_height = FRAMEBUFFER_HEIGHT;
+  int screen_width = SCREEN_WIDTH;
+  int screen_height = SCREEN_HEIGHT;
   // keyboard_width == screen_width
   int keyboard_height = screen_width;
 
@@ -41,9 +39,9 @@ void init_platform() {
 }
 
 void ion_set_pixel(uint8_t x, uint8_t y, uint8_t color) {
-  assert(x <= FRAMEBUFFER_WIDTH);
-  assert(y <= FRAMEBUFFER_HEIGHT);
-  char * byte = (char *)(FRAMEBUFFER_ADDRESS) + ((y*FRAMEBUFFER_WIDTH)+x);
+  assert(x <= SCREEN_WIDTH);
+  assert(y <= SCREEN_HEIGHT);
+  char * byte = (char *)(FRAMEBUFFER_ADDRESS) + ((y*SCREEN_WIDTH)+x);
   *byte = color;
 }
 
diff --git a/kandinsky/src/line.c b/kandinsky/src/line.c
index ef548100f..1deb9dd6b 100644
--- a/kandinsky/src/line.c
+++ b/kandinsky/src/line.c
@@ -49,10 +49,7 @@ void KDDrawLine(KDPoint p1, KDPoint p2, KDColor c) {
 
   KDCoordinate scanCounter = 0;
   while (scanCounter++ < scanLength) {
-    // FIXME
-    if (p.x>=0 && p.x < 240 && p.y>=0 && p.y<=160) {
-      KDSetPixel(p, c);
-    }
+    KDSetPixel(p, c);
     p = KDPointTranslate(p, alwaysTranslate);
     error = error - minusError;
     if (error <= 0) {
diff --git a/quiz/src/runner.c b/quiz/src/runner.c
index 68cb48fa9..a19e202d8 100644
--- a/quiz/src/runner.c
+++ b/quiz/src/runner.c
@@ -8,7 +8,7 @@ void print(char * message) {
   int line_height = KDStringSize("M").height;
   KDDrawString(message, (KDPoint){.x = 0, .y = line_y});
   line_y += line_height;
-  if (line_y > 160) {
+  if (line_y > SCREEN_HEIGHT) {
     line_y = 0;
     ion_getchar();
     // Clear screen maybe?