diff --git a/README.md b/README.md
index 6942c5f6..9a620bff 100644
--- a/README.md
+++ b/README.md
@@ -309,9 +309,9 @@ key | optional | type | default | description
 `class` | False | string | | The name of the Class.
 `config` | False | complex | | Config/Mapping between Homeassistant and your NsPanel
 
-### Override Icons
+### Override Icons or Names
 
-To override Icons of entities you can configure an icon name in your configuration, please see the following example.
+To override Icons or Names of entities you can configure an icon and/or name in your configuration, please see the following example.
 Only the icons listed in the [Icon Table](HMI#icons-ids) are useable.
 
 ```yaml
@@ -322,6 +322,7 @@ Only the icons listed in the [Icon Table](HMI#icons-ids) are useable.
           - light.schreibtischlampe
           - switch.deckenbeleuchtung_hinten:
               icon: lightbulb
+              name: Lampe
           - delete
           - delete
       - type: cardMedia
diff --git a/apps/nspanel-lovelace-ui/nspanel-lovelace-ui.py b/apps/nspanel-lovelace-ui/nspanel-lovelace-ui.py
index 93f24efb..bbcdb0c8 100644
--- a/apps/nspanel-lovelace-ui/nspanel-lovelace-ui.py
+++ b/apps/nspanel-lovelace-ui/nspanel-lovelace-ui.py
@@ -433,8 +433,10 @@ class LovelaceUIPanel:
 
   def generate_entities_item(self, item):
     icon = None
+    name = None
     if type(item) is dict:
-      icon = next(iter(item.items()))[1]['icon']
+      icon = next(iter(item.items()))[1].get('icon')
+      name = next(iter(item.items()))[1].get('name')
       item = next(iter(item.items()))[0]
 
     # type of the item is the string before the "." in the item name
@@ -449,7 +451,7 @@ class LovelaceUIPanel:
       return f",text,{item},{get_icon_id('alert-circle-outline')},17299,Not found check, apps.yaml"
 
     entity = self.api.get_entity(item)
-    name = entity.attributes.friendly_name
+    name = name if name is not None else entity.attributes.friendly_name
 
     if item_type == "cover":
       icon_id = get_icon_id_ha("cover", state=entity.state, overwrite=icon)