diff --git a/projects/frontend/es-core/src/components/HelpComponent.cpp b/projects/frontend/es-core/src/components/HelpComponent.cpp
index 5a5b197608bcd529e6290568caaf3b96859f800a..43c9ea08ddfb2040a28f64fdb3dc6875847040dd 100644
--- a/projects/frontend/es-core/src/components/HelpComponent.cpp
+++ b/projects/frontend/es-core/src/components/HelpComponent.cpp
@@ -271,6 +271,7 @@ void HelpComponent::OnApplyThemeElement(const ThemeElement& element, ThemeProper
   if(element.HasProperty(ThemePropertyName::IconL3R3))            mImagesPath[(int)HelpType::L3R3]          = Path(element.AsString(ThemePropertyName::IconL3R3));
   if(element.HasProperty(ThemePropertyName::IconStart))           mImagesPath[(int)HelpType::Start]         = Path(element.AsString(ThemePropertyName::IconStart));
   if(element.HasProperty(ThemePropertyName::IconSelect))          mImagesPath[(int)HelpType::Select]        = Path(element.AsString(ThemePropertyName::IconSelect));
+  if(element.HasProperty(ThemePropertyName::IconHotkey))          mImagesPath[(int)HelpType::HotkeyCombo]   = Path(element.AsString(ThemePropertyName::IconHotkey));
 }
 
 void HelpComponent::ViewChanged(ViewType currentView, bool hasWindowOver)
@@ -280,7 +281,7 @@ void HelpComponent::ViewChanged(ViewType currentView, bool hasWindowOver)
 
   if (hasWindowOver)
   {
-    // We are on a menu or a window. Select menu view or if it doesn't exists, just keep default
+    // We are on a menu or a window. Select menu view or if it doesn't exist, just keep default
     if (ThemeManager::Instance().Main().HasMenuView())
       viewName = "menu";
   }
diff --git a/projects/frontend/es-core/src/themes/PropertyNames.h b/projects/frontend/es-core/src/themes/PropertyNames.h
index 5cffdb31db9a1d16d355c7b5167c13468d2e195e..9a20d2d17362e25818eeaeb8108d8adf3c4e43af 100644
--- a/projects/frontend/es-core/src/themes/PropertyNames.h
+++ b/projects/frontend/es-core/src/themes/PropertyNames.h
@@ -42,6 +42,7 @@ enum class ThemePropertyName
   IconDownload,
   IconFastShutdown,
   IconGames,
+  IconHotkey,
   IconKodi,
   IconL,
   IconL2,
diff --git a/projects/frontend/es-core/src/themes/ThemeSupport.cpp b/projects/frontend/es-core/src/themes/ThemeSupport.cpp
index bf4ae3bd7423fdcd8c73283cb268c0b4fe4a5dbb..d963d9f4121877c80c5b50cbc78072e78dbc335c 100644
--- a/projects/frontend/es-core/src/themes/ThemeSupport.cpp
+++ b/projects/frontend/es-core/src/themes/ThemeSupport.cpp
@@ -52,6 +52,7 @@ void ThemeSupport::InitializeStatics()
       case ThemePropertyName::IconDownload:
       case ThemePropertyName::IconFastShutdown:
       case ThemePropertyName::IconGames:
+      case ThemePropertyName::IconHotkey:
       case ThemePropertyName::IconKodi:
       case ThemePropertyName::IconL:
       case ThemePropertyName::IconL2:
@@ -383,6 +384,7 @@ HashMap<ThemeElementType, ThemePropertyNameBits>& ThemeSupport::ElementMap()
           ThemePropertyName::IconR3,
           ThemePropertyName::IconStart,
           ThemePropertyName::IconSelect,
+          ThemePropertyName::IconHotkey,
         },
       },
       {
@@ -571,6 +573,7 @@ HashMap<String, ThemePropertyName>& ThemeSupport::PropertyName()
     { "iconDownload", ThemePropertyName::IconDownload },
     { "iconFastShutdown", ThemePropertyName::IconFastShutdown },
     { "iconGames", ThemePropertyName::IconGames },
+    { "iconHotkey", ThemePropertyName::IconHotkey },
     { "iconKodi", ThemePropertyName::IconKodi },
     { "iconL", ThemePropertyName::IconL },
     { "iconL2", ThemePropertyName::IconL2 },
@@ -680,6 +683,7 @@ String ThemeSupport::ReversePropertyName(ThemePropertyName name)
     { ThemePropertyName::IconDownload, "iconDownload" },
     { ThemePropertyName::IconFastShutdown, "iconFastShutdown" },
     { ThemePropertyName::IconGames, "iconGames" },
+    { ThemePropertyName::IconHotkey, "iconHotkey" },
     { ThemePropertyName::IconKodi, "iconKodi" },
     { ThemePropertyName::IconL, "iconL" },
     { ThemePropertyName::IconL2, "iconL2" },