diff --git a/apps/settings/base.de.i18n b/apps/settings/base.de.i18n
index 3ed41780d..ad4a10cd4 100644
--- a/apps/settings/base.de.i18n
+++ b/apps/settings/base.de.i18n
@@ -11,6 +11,7 @@ ActivateExamMode = "Start Testmodus"
 ExamModeActive = "Testmodus: aktiv"
 About = "Über"
 Degres = "Grad "
+Gradians = "Gradians "
 Radian = "Bogenmaß "
 Decimal = "Dezimal "
 Scientific = "Wissenschaftlich "
diff --git a/apps/settings/base.en.i18n b/apps/settings/base.en.i18n
index 3b706c0e7..2c5302376 100644
--- a/apps/settings/base.en.i18n
+++ b/apps/settings/base.en.i18n
@@ -11,6 +11,7 @@ ActivateExamMode = "Activate exam mode"
 ExamModeActive = "Exam mode: active"
 About = "About"
 Degres = "Degrees "
+Gradians = "Gradians "
 Radian = "Radians "
 Decimal = "Decimal "
 Scientific = "Scientific "
diff --git a/apps/settings/base.es.i18n b/apps/settings/base.es.i18n
index 7c14e1e10..c086e79a2 100644
--- a/apps/settings/base.es.i18n
+++ b/apps/settings/base.es.i18n
@@ -11,6 +11,7 @@ ActivateExamMode = "Activar el modo examen"
 ExamModeActive = "Modo examen: activo"
 About = "Acerca"
 Degres = "Grados "
+Gradians = "Gradians "
 Radian = "Radianes "
 Decimal = "Decimal "
 Scientific = "Científico "
diff --git a/apps/settings/base.fr.i18n b/apps/settings/base.fr.i18n
index 9a6cc3547..b5aba4e39 100644
--- a/apps/settings/base.fr.i18n
+++ b/apps/settings/base.fr.i18n
@@ -11,6 +11,7 @@ ActivateExamMode = "Activer le mode examen"
 ExamModeActive = "Mode examen: actif"
 About = "À propos"
 Degres = "Degrés "
+Gradians = "Grades "
 Radian = "Radians "
 Decimal = "Décimal "
 Scientific = "Scientifique "
diff --git a/apps/settings/base.pt.i18n b/apps/settings/base.pt.i18n
index 85d70c976..47e66766c 100644
--- a/apps/settings/base.pt.i18n
+++ b/apps/settings/base.pt.i18n
@@ -11,6 +11,7 @@ ActivateExamMode = "Inicio modo de exame"
 ExamModeActive = "Modo de exame : ativo"
 About = "Acerca"
 Degres = "Graus "
+Gradians = "Gradians "
 Radian = "Radianos "
 Decimal = "Decimal "
 Scientific = "Científico "
diff --git a/apps/settings/main_controller.cpp b/apps/settings/main_controller.cpp
index df748f77e..8d2ac8404 100644
--- a/apps/settings/main_controller.cpp
+++ b/apps/settings/main_controller.cpp
@@ -7,7 +7,7 @@ using namespace Poincare;
 
 namespace Settings {
 
-const SettingsMessageTree angleChildren[2] = {SettingsMessageTree(I18n::Message::Degres), SettingsMessageTree(I18n::Message::Radian)};
+const SettingsMessageTree angleChildren[3] = {SettingsMessageTree(I18n::Message::Degres), SettingsMessageTree(I18n::Message::Gradians),SettingsMessageTree(I18n::Message::Radian)};
 const SettingsMessageTree editionModeChildren[2] = {SettingsMessageTree(I18n::Message::Edition2D), SettingsMessageTree(I18n::Message::EditionLinear)};
 const SettingsMessageTree floatDisplayModeChildren[3] = {SettingsMessageTree(I18n::Message::Decimal), SettingsMessageTree(I18n::Message::Scientific), SettingsMessageTree(I18n::Message::SignificantFigures)};
 const SettingsMessageTree complexFormatChildren[3] = {SettingsMessageTree(I18n::Message::Real), SettingsMessageTree(I18n::Message::Cartesian), SettingsMessageTree(I18n::Message::Polar)};
@@ -19,7 +19,7 @@ const SettingsMessageTree menu[9] =
 #else
 const SettingsMessageTree menu[8] =
 #endif
-  {SettingsMessageTree(I18n::Message::AngleUnit, angleChildren, 2),
+  {SettingsMessageTree(I18n::Message::AngleUnit, angleChildren, 3),
     SettingsMessageTree(I18n::Message::DisplayMode, floatDisplayModeChildren, 3),
     SettingsMessageTree(I18n::Message::EditionMode, editionModeChildren, 2),
     SettingsMessageTree(I18n::Message::ComplexFormat, complexFormatChildren, 3),
diff --git a/apps/settings/sub_menu/preferences_controller.cpp b/apps/settings/sub_menu/preferences_controller.cpp
index 527a4a530..6a82a9afd 100644
--- a/apps/settings/sub_menu/preferences_controller.cpp
+++ b/apps/settings/sub_menu/preferences_controller.cpp
@@ -57,6 +57,11 @@ Layout PreferencesController::layoutForPreferences(I18n::Message message) {
       const char * degEx = "90°";
       return LayoutHelper::String(degEx, strlen(degEx), k_layoutFont);
     }
+    case I18n::Message::Gradians:
+    {
+      const char * degEx = "100 gon";
+      return LayoutHelper::String(degEx, strlen(degEx), k_layoutFont);
+    }
     case I18n::Message::Radian:
       return FractionLayout::Builder(
           CodePointLayout::Builder(UCodePointGreekSmallLetterPi, k_layoutFont),
diff --git a/apps/shared.de.i18n b/apps/shared.de.i18n
index da4a09283..0fc50f192 100644
--- a/apps/shared.de.i18n
+++ b/apps/shared.de.i18n
@@ -21,6 +21,7 @@ FillWithFormula = "Mit einer Formel füllen"
 ForbiddenValue = "Verbotener Wert"
 FunctionColumn = "0(0) Spalte"
 FunctionOptions = "Funktionsoptionen"
+Gon = "gon"
 Goto = "Gehe zu"
 GraphTab = "Graph"
 HardwareTestLaunch1 = "Sie sind dabei den Hardwaretest zu"
diff --git a/apps/shared.en.i18n b/apps/shared.en.i18n
index 625a37ec8..8fa627e44 100644
--- a/apps/shared.en.i18n
+++ b/apps/shared.en.i18n
@@ -21,6 +21,7 @@ FillWithFormula = "Fill with a formula"
 ForbiddenValue = "Forbidden value"
 FunctionColumn = "0(0) column"
 FunctionOptions = "Function options"
+Gon = "gon"
 Goto = "Go to"
 GraphTab = "Graph"
 HardwareTestLaunch1 = "You are starting the hardware"
diff --git a/apps/shared.es.i18n b/apps/shared.es.i18n
index dda6b3622..afa03d9cf 100644
--- a/apps/shared.es.i18n
+++ b/apps/shared.es.i18n
@@ -21,6 +21,7 @@ FillWithFormula = "Rellenar con una fórmula"
 ForbiddenValue = "Valor prohibido"
 FunctionColumn = "Columna 0(0)"
 FunctionOptions = "Opciones de la función"
+Gon = "gon"
 Goto = "Ir a"
 GraphTab = "Gráfico"
 HardwareTestLaunch1 = "Esta iniciando la prueba de"
diff --git a/apps/shared.fr.i18n b/apps/shared.fr.i18n
index e07ab4d63..98339a194 100644
--- a/apps/shared.fr.i18n
+++ b/apps/shared.fr.i18n
@@ -21,6 +21,7 @@ FillWithFormula = "Remplir avec une formule"
 ForbiddenValue = "Valeur interdite"
 FunctionColumn = "Colonne 0(0)"
 FunctionOptions = "Options de la fonction"
+Gon = "gon"
 Goto = "Aller à"
 GraphTab = "Graphique"
 HardwareTestLaunch1 = "Vous allez lancer le test usine."
diff --git a/apps/shared.pt.i18n b/apps/shared.pt.i18n
index 6ea6a7d59..a86b7aa97 100644
--- a/apps/shared.pt.i18n
+++ b/apps/shared.pt.i18n
@@ -21,6 +21,7 @@ FillWithFormula = "Preencher com uma fórmula"
 ForbiddenValue = "Valor proibida"
 FunctionColumn = "Coluna 0(0)"
 FunctionOptions = "Opções de função"
+Gon = "gon"
 Goto = "Ir a"
 GraphTab = "Gráfico"
 HardwareTestLaunch1 = "Você vai executar o teste da planta."
diff --git a/apps/title_bar_view.cpp b/apps/title_bar_view.cpp
index b47c7f3a5..2e208c0ca 100644
--- a/apps/title_bar_view.cpp
+++ b/apps/title_bar_view.cpp
@@ -90,6 +90,8 @@ void TitleBarView::refreshPreferences() {
   }
   if (preferences->angleUnit() == Preferences::AngleUnit::Radian) {
     numberOfChar += strlcpy(buffer+numberOfChar, I18n::translate(I18n::Message::Rad), bufferSize - numberOfChar);
+  } else if (preferences->angleUnit() == Preferences::AngleUnit::Gradian) {
+    numberOfChar += strlcpy(buffer+numberOfChar, I18n::translate(I18n::Message::Gon), bufferSize - numberOfChar);
   } else {
     numberOfChar += strlcpy(buffer+numberOfChar, I18n::translate(I18n::Message::Deg), bufferSize - numberOfChar);
   }