diff --git a/poincare/include/poincare/integer.h b/poincare/include/poincare/integer.h
index 11aea50db..ce940e225 100644
--- a/poincare/include/poincare/integer.h
+++ b/poincare/include/poincare/integer.h
@@ -96,8 +96,8 @@ public:
   // Serialization
   int serialize(char * buffer, int bufferSize) const;
 
-  //Layout
-  HorizontalLayout createLayout() const;
+  // Layout
+  Layout createLayout() const;
 
   // Approximation
   template<typename T> T approximate() const;
diff --git a/poincare/src/integer.cpp b/poincare/src/integer.cpp
index 2c38ce69c..a28e19e0b 100644
--- a/poincare/src/integer.cpp
+++ b/poincare/src/integer.cpp
@@ -1,7 +1,9 @@
 #include <poincare/integer.h>
+#include <poincare/code_point_layout.h>
 #include <poincare/ieee754.h>
 #include <poincare/layout_helper.h>
 #include <poincare/serialization_helper.h>
+#include <ion/unicode/utf8_decoder.h>
 #include <ion/unicode/utf8_helper.h>
 #include <cmath>
 #include <utility>
@@ -202,9 +204,14 @@ int Integer::serialize(char * buffer, int bufferSize) const {
 
 // Layout
 
-HorizontalLayout Integer::createLayout() const {
+Layout Integer::createLayout() const {
   char buffer[k_maxNumberOfDigitsBase10];
   int numberOfChars = serialize(buffer, k_maxNumberOfDigitsBase10);
+  assert(numberOfChars >= 1);
+  if ((int)UTF8Decoder::CharSizeOfCodePoint(buffer[0]) == numberOfChars) {
+    UTF8Decoder decoder = UTF8Decoder(buffer);
+    return CodePointLayout::Builder(decoder.nextCodePoint());
+  }
   return LayoutHelper::String(buffer, numberOfChars);
 }
 
diff --git a/poincare/src/rational.cpp b/poincare/src/rational.cpp
index e5e9ee87a..e94eecd6d 100644
--- a/poincare/src/rational.cpp
+++ b/poincare/src/rational.cpp
@@ -96,11 +96,11 @@ Expression RationalNode::setSign(Sign s, Context * context, Preferences::Complex
 // Layout
 
 Layout RationalNode::createLayout(Preferences::PrintFloatMode floatDisplayMode, int numberOfSignificantDigits) const {
-  HorizontalLayout numeratorLayout = signedNumerator().createLayout();
+  Layout numeratorLayout = signedNumerator().createLayout();
   if (denominator().isOne()) {
     return numeratorLayout;
   }
-  HorizontalLayout denominatorLayout = denominator().createLayout();
+  Layout denominatorLayout = denominator().createLayout();
   return FractionLayout::Builder(numeratorLayout, denominatorLayout);
 }