diff --git a/apps/code/python_toolbox.cpp b/apps/code/python_toolbox.cpp
index ba0cd5241..982a03ca3 100644
--- a/apps/code/python_toolbox.cpp
+++ b/apps/code/python_toolbox.cpp
@@ -256,7 +256,7 @@ const ToolboxMessageTree toolboxModel = ToolboxMessageTree(I18n::Message::Toolbo
 
 
 PythonToolbox::PythonToolbox() :
-  Toolbox(nullptr, I18n::translate(rootModel()->label()))
+  Toolbox(nullptr, rootModel()->label())
 {
 }
 
diff --git a/apps/math_toolbox.cpp b/apps/math_toolbox.cpp
index f60e4f966..d40b48406 100644
--- a/apps/math_toolbox.cpp
+++ b/apps/math_toolbox.cpp
@@ -107,7 +107,7 @@ const ToolboxMessageTree toolboxModel = ToolboxMessageTree(I18n::Message::Toolbo
 #endif
 
 MathToolbox::MathToolbox() :
-  Toolbox(nullptr, I18n::translate(rootModel()->label()))
+  Toolbox(nullptr, rootModel()->label())
 {
 }
 
diff --git a/escher/include/escher/nested_menu_controller.h b/escher/include/escher/nested_menu_controller.h
index bb7fea2aa..acb027ad0 100644
--- a/escher/include/escher/nested_menu_controller.h
+++ b/escher/include/escher/nested_menu_controller.h
@@ -8,7 +8,7 @@
 
 class NestedMenuController : public StackViewController, public ListViewDataSource, public SelectableTableViewDataSource {
 public:
-  NestedMenuController(Responder * parentResponder, const char * title = 0);
+  NestedMenuController(Responder * parentResponder, I18n::Message title = (I18n::Message)0);
   void setSender(Responder * sender) { m_sender = sender; }
 
   // StackViewController
@@ -45,7 +45,7 @@ protected:
 
   class ListController : public ViewController {
   public:
-    ListController(Responder * parentResponder, SelectableTableView * tableView, const char * title);
+    ListController(Responder * parentResponder, SelectableTableView * tableView, I18n::Message title);
     const char * title() override;
     View * view() override;
     void didBecomeFirstResponder() override;
@@ -53,7 +53,7 @@ protected:
   private:
     SelectableTableView * m_selectableTableView;
     int m_firstSelectedRow;
-    const char * m_title;
+    I18n::Message m_title;
   };
 
   static constexpr int LeafCellType = 0;
diff --git a/escher/include/escher/toolbox.h b/escher/include/escher/toolbox.h
index 5b6fa3361..068578c52 100644
--- a/escher/include/escher/toolbox.h
+++ b/escher/include/escher/toolbox.h
@@ -8,7 +8,7 @@
 
 class Toolbox : public NestedMenuController {
 public:
-  Toolbox(Responder * parentResponder, const char * title = 0);
+  Toolbox(Responder * parentResponder, I18n::Message title = (I18n::Message)0);
 
   // StackViewController
   void viewWillAppear() override;
diff --git a/escher/src/nested_menu_controller.cpp b/escher/src/nested_menu_controller.cpp
index 482f5144e..cc2498745 100644
--- a/escher/src/nested_menu_controller.cpp
+++ b/escher/src/nested_menu_controller.cpp
@@ -59,7 +59,7 @@ void NestedMenuController::Stack::resetStack() {
 
 /* List Controller */
 
-NestedMenuController::ListController::ListController(Responder * parentResponder, SelectableTableView * tableView, const char * title) :
+NestedMenuController::ListController::ListController(Responder * parentResponder, SelectableTableView * tableView, I18n::Message title) :
   ViewController(parentResponder),
   m_selectableTableView(tableView),
   m_firstSelectedRow(0),
@@ -68,7 +68,7 @@ NestedMenuController::ListController::ListController(Responder * parentResponder
 }
 
 const char * NestedMenuController::ListController::title() {
-  return m_title;
+  return I18n::translate(m_title);
 }
 
 View * NestedMenuController::ListController::view() {
@@ -87,7 +87,7 @@ void NestedMenuController::ListController::setFirstSelectedRow(int firstSelected
 
 /* NestedMenuController */
 
-NestedMenuController::NestedMenuController(Responder * parentResponder, const char * title) :
+NestedMenuController::NestedMenuController(Responder * parentResponder, I18n::Message title) :
   StackViewController(parentResponder, &m_listController, KDColorWhite, Palette::PurpleBright, Palette::PurpleDark),
   m_selectableTableView(&m_listController, this, this),
   m_listController(this, &m_selectableTableView, title),
diff --git a/escher/src/toolbox.cpp b/escher/src/toolbox.cpp
index b5649c682..f74c6cec6 100644
--- a/escher/src/toolbox.cpp
+++ b/escher/src/toolbox.cpp
@@ -3,7 +3,7 @@
 #include <assert.h>
 #include <string.h>
 
-Toolbox::Toolbox(Responder * parentResponder, const char * title) :
+Toolbox::Toolbox(Responder * parentResponder, I18n::Message title) :
   NestedMenuController(parentResponder, title),
   m_messageTreeModel(nullptr)
 {}