diff --git a/apps/code/i18n/toolbox.de.i18n b/apps/code/i18n/toolbox.de.i18n
index e18204dafc..78f5dc3102 100644
--- a/apps/code/i18n/toolbox.de.i18n
+++ b/apps/code/i18n/toolbox.de.i18n
@@ -1,3 +1,4 @@
 Catalog = "Katalog"
 Modules = "Module"
 LoopsAndTests = "Schleifen und Tests"
+FunctionsAndClasses = "Funktionen und Klassen"
diff --git a/apps/code/i18n/toolbox.en.i18n b/apps/code/i18n/toolbox.en.i18n
index b0f4dc5c1d..57f646995c 100644
--- a/apps/code/i18n/toolbox.en.i18n
+++ b/apps/code/i18n/toolbox.en.i18n
@@ -1,3 +1,4 @@
 Catalog = "Catalog"
 Modules = "Modules"
 LoopsAndTests = "Loops and tests"
+FunctionsAndClasses = "Functions and classes"
diff --git a/apps/code/i18n/toolbox.es.i18n b/apps/code/i18n/toolbox.es.i18n
index b0f4dc5c1d..cbf9ff3286 100644
--- a/apps/code/i18n/toolbox.es.i18n
+++ b/apps/code/i18n/toolbox.es.i18n
@@ -1,3 +1,4 @@
 Catalog = "Catalog"
 Modules = "Modules"
 LoopsAndTests = "Loops and tests"
+FunctionsAndClasses = "funciones y clases"
diff --git a/apps/code/i18n/toolbox.fr.i18n b/apps/code/i18n/toolbox.fr.i18n
index bf88b0d9fb..9c50b9ce84 100644
--- a/apps/code/i18n/toolbox.fr.i18n
+++ b/apps/code/i18n/toolbox.fr.i18n
@@ -1,3 +1,4 @@
 Catalog = "Catalogue"
 Modules = "Modules"
 LoopsAndTests = "Boucles et tests"
+FunctionsAndClasses = "Fonction et classes"
diff --git a/apps/code/i18n/toolbox.it.i18n b/apps/code/i18n/toolbox.it.i18n
index 101051435c..34a0a59614 100644
--- a/apps/code/i18n/toolbox.it.i18n
+++ b/apps/code/i18n/toolbox.it.i18n
@@ -1,3 +1,4 @@
 Catalog = "Catalogo"
 Modules = "Moduli"
 LoopsAndTests = "Cicli e test"
+FunctionsAndClasses = "funzioni e classi"
diff --git a/apps/code/i18n/toolbox.nl.i18n b/apps/code/i18n/toolbox.nl.i18n
index b1ae5efb65..b228fcb3c8 100644
--- a/apps/code/i18n/toolbox.nl.i18n
+++ b/apps/code/i18n/toolbox.nl.i18n
@@ -1,3 +1,4 @@
 Catalog = "Catalogus"
 Modules = "Modules"
 LoopsAndTests = "Herhalingen en testen"
+FunctionsAndClasses = "functies en klassen"
diff --git a/apps/code/i18n/toolbox.pt.i18n b/apps/code/i18n/toolbox.pt.i18n
index 9f167d535d..5960f84301 100644
--- a/apps/code/i18n/toolbox.pt.i18n
+++ b/apps/code/i18n/toolbox.pt.i18n
@@ -1,3 +1,4 @@
 Catalog = "Catálogo"
 Modules = "Módulos"
 LoopsAndTests = "Laços e testes"
+FunctionsAndClasses = "funções e classes"
diff --git a/apps/code/i18n/toolbox.universal.i18n b/apps/code/i18n/toolbox.universal.i18n
index 7fb2dc8d03..cf07a27c97 100644
--- a/apps/code/i18n/toolbox.universal.i18n
+++ b/apps/code/i18n/toolbox.universal.i18n
@@ -46,5 +46,11 @@ ForInRange1ArgLoopWithArg = "for i in range(size):\n  instruction"
 PythonCommandDef = "def \x11():\n  "
 PythonCommandDefWithArg = "def function(x):"
 PythonCommandReturn = "return "
+PythonCommandClassWithArg = "class ClassName:"
+PythonCommandClass = "class \x11:\n  "
+PythonCommandInitDefWithArg = "def __init__(self):"
+PythonCommandInitDef = "def __init__(self):\n  "
+PythonCommandClassSelf = "self."
+PythonCommandStaticMethodDecorator = "@staticmethod"
 RandomModule = "random"
 NumpyModule = "numpy"
diff --git a/apps/code/python_toolbox_controller.cpp b/apps/code/python_toolbox_controller.cpp
index 018b9af09c..af7424faea 100644
--- a/apps/code/python_toolbox_controller.cpp
+++ b/apps/code/python_toolbox_controller.cpp
@@ -1002,11 +1002,22 @@ constexpr ToolboxMessageTree catalogChildren[] = {
                              I18n::Message::PythonZeros),
 };
 
-constexpr ToolboxMessageTree functionsChildren[] = {
+constexpr ToolboxMessageTree functionsAndClassesChildren[] = {
     ToolboxMessageTree::Leaf(I18n::Message::PythonCommandDefWithArg,
                              I18n::Message::Default, false,
                              I18n::Message::PythonCommandDef),
     ToolboxMessageTree::Leaf(I18n::Message::PythonCommandReturn,
+                             I18n::Message::Default),
+
+    ToolboxMessageTree::Leaf(I18n::Message::PythonCommandClassWithArg,
+                             I18n::Message::Default, false,
+                             I18n::Message::PythonCommandClass),
+    ToolboxMessageTree::Leaf(I18n::Message::PythonCommandInitDefWithArg,
+                             I18n::Message::Default, false,
+                             I18n::Message::PythonCommandInitDef),
+    ToolboxMessageTree::Leaf(I18n::Message::PythonCommandClassSelf,
+                             I18n::Message::Default),
+    ToolboxMessageTree::Leaf(I18n::Message::PythonCommandStaticMethodDecorator,
                              I18n::Message::Default)};
 
 constexpr ToolboxMessageTree menu[] = {
@@ -1014,7 +1025,7 @@ constexpr ToolboxMessageTree menu[] = {
                              loopsAndTestsChildren),
     ToolboxMessageTree::Node(I18n::Message::Modules, modulesChildren),
     ToolboxMessageTree::Node(I18n::Message::Catalog, catalogChildren),
-    ToolboxMessageTree::Node(I18n::Message::Functions, functionsChildren)};
+    ToolboxMessageTree::Node(I18n::Message::FunctionsAndClasses, functionsAndClassesChildren)};
 
 constexpr ToolboxMessageTree toolboxModel =
     ToolboxMessageTree::Node(I18n::Message::Toolbox, menu);