diff --git a/apps/settings/sub_menu/code_options_controller.cpp b/apps/settings/sub_menu/code_options_controller.cpp
index 1aff07456..ee8d296f6 100644
--- a/apps/settings/sub_menu/code_options_controller.cpp
+++ b/apps/settings/sub_menu/code_options_controller.cpp
@@ -10,12 +10,8 @@ CodeOptionsController::CodeOptionsController(Responder * parentResponder) :
   GenericSubController(parentResponder),
   m_preferencesController(this)
 {
-  for (int i = 0; i < k_totalNumberOfCell; i++) {
-    m_cells[i].setMessageFont(KDFont::LargeFont);
-  }
-  for (int i = 0; i < k_totalNumberOfSwitchCells; i++) {
-    m_switchCells[i].setMessageFont(KDFont::LargeFont);
-  }
+  m_chevronCell.setMessageFont(KDFont::LargeFont);
+  m_switchCell.setMessageFont(KDFont::LargeFont);
 }
 
 bool CodeOptionsController::handleEvent(Ion::Events::Event event) {
@@ -44,7 +40,10 @@ bool CodeOptionsController::handleEvent(Ion::Events::Event event) {
 HighlightCell * CodeOptionsController::reusableCell(int index, int type) {
   assert(type == 0);
   assert(index >= 0 && index < k_totalNumberOfCell);
-  return &m_cells[index];
+  if (index == 0) {
+    return &m_chevronCell;
+  }
+  return &m_switchCell;
 }
 
 int CodeOptionsController::reusableCellCount(int type) {
diff --git a/apps/settings/sub_menu/code_options_controller.h b/apps/settings/sub_menu/code_options_controller.h
index 44bea0a3d..d3a82e336 100644
--- a/apps/settings/sub_menu/code_options_controller.h
+++ b/apps/settings/sub_menu/code_options_controller.h
@@ -14,11 +14,10 @@ public:
   int reusableCellCount(int type) override;
   void willDisplayCellForIndex(HighlightCell * cell, int index) override;
 private:
-  constexpr static int k_totalNumberOfCell = 1;
-  constexpr static int k_totalNumberOfSwitchCells = 1;
+  constexpr static int k_totalNumberOfCell = 2;
   PreferencesController m_preferencesController;
-  MessageTableCellWithChevronAndMessage m_cells[k_totalNumberOfCell];
-  MessageTableCellWithSwitch m_switchCells[k_totalNumberOfCell];
+  MessageTableCellWithChevronAndMessage m_chevronCell;
+  MessageTableCellWithSwitch m_switchCell;
 };
 
 }