diff --git a/src/activities/util/KeyboardEntryActivity.cpp b/src/activities/util/KeyboardEntryActivity.cpp
index 724a55cd..c9f53e3b 100644
--- a/src/activities/util/KeyboardEntryActivity.cpp
+++ b/src/activities/util/KeyboardEntryActivity.cpp
@@ -311,7 +311,7 @@ void KeyboardEntryActivity::render(RenderLock&&) {
   bottomKeys.push_back({KeyboardKeyType::Shift, symMode ? shiftString[0] : shiftString[shiftState]});
   bottomKeys.push_back({KeyboardKeyType::Mode, symMode ? "abc" : "#@!"});
   if (isPassword) {
-    bottomKeys.push_back({KeyboardKeyType::Normal, passwordVisible ? tr(STR_HIDE) : tr(STR_SHOW)});
+    bottomKeys.push_back({KeyboardKeyType::Reveal, passwordVisible ? tr(STR_HIDE) : tr(STR_SHOW)});
   }
   bottomKeys.push_back({KeyboardKeyType::Space, nullptr});
   bottomKeys.push_back({KeyboardKeyType::Del, nullptr});
diff --git a/src/components/themes/BaseTheme.cpp b/src/components/themes/BaseTheme.cpp
index 17bc16ce..bb76c030 100644
--- a/src/components/themes/BaseTheme.cpp
+++ b/src/components/themes/BaseTheme.cpp
@@ -884,8 +884,9 @@ void BaseTheme::drawKeyboardKey(const GfxRenderer& renderer, Rect rect, const ch
                                 const char* secondaryLabel, const KeyboardKeyType keyType) const {
   if (isSelected) {
     renderer.fillRect(rect.x, rect.y, rect.width, rect.height, true);
-  } else if (keyType == KeyboardKeyType::Shift || keyType == KeyboardKeyType::Mode || keyType == KeyboardKeyType::Del ||
-             keyType == KeyboardKeyType::Space || keyType == KeyboardKeyType::Ok) {
+  } else if (keyType == KeyboardKeyType::Shift || keyType == KeyboardKeyType::Mode ||
+             keyType == KeyboardKeyType::Reveal || keyType == KeyboardKeyType::Space ||
+             keyType == KeyboardKeyType::Del || keyType == KeyboardKeyType::Ok) {
     renderer.drawRect(rect.x, rect.y, rect.width, rect.height);
   }
 
diff --git a/src/components/themes/BaseTheme.h b/src/components/themes/BaseTheme.h
index 1e2571e8..68b5fab0 100644
--- a/src/components/themes/BaseTheme.h
+++ b/src/components/themes/BaseTheme.h
@@ -68,7 +68,7 @@ struct ThemeMetrics {
 
 enum UIIcon { Folder, Text, Image, Book, File, Recent, Settings, Transfer, Library, Wifi, Hotspot, Weather };
 
-enum class KeyboardKeyType { Normal, Shift, Mode, Space, Del, Ok };
+enum class KeyboardKeyType { Normal, Shift, Mode, Reveal, Space, Del, Ok };
 
 // Default theme implementation (Classic Theme)
 // Additional themes can inherit from this and override methods as needed