diff --git a/ReleaseNotes.md b/ReleaseNotes.md
index de2c064..1655bf7 100644
--- a/ReleaseNotes.md
+++ b/ReleaseNotes.md
@@ -184,7 +184,7 @@ The commands are still a bit laggy, but we will look for ways to improve this in
 Now you can add up to 3 customize buttons to the Home page. You can select a climate, cover, fan, light or media player and an icon of your preference, which will be shown in the Home page right above the already known icons for QRcode and entities pages.
 By clicking in the icon, the detailed page will be opened with the selected entity. With that, all those icons will have a similar behavior of jumping to another page.
 ![Home page](https://user-images.githubusercontent.com/41958506/212768891-9610d800-43c5-454f-a8b6-6b7c43677b5d.png)
-- To keep consistency with other buttons on this page, only entities supporting advanced settings will be functional on these custom buttons.
+- To keep consistency with other buttons on this page, entities supporting advanced settings will open the settings page with the click. All other entities will toggle or execute, with no visual feedback,
 
  
 ### 17. New controls for dimming and sleeping time
diff --git a/nspanel_blueprint.yaml b/nspanel_blueprint.yaml
index 7a9e338..60d9a0c 100644
--- a/nspanel_blueprint.yaml
+++ b/nspanel_blueprint.yaml
@@ -510,17 +510,27 @@ blueprint:
             description: >
               *HOME page*
 
-              *Entity which should be displayed (ONLY climate | cover | fan | light | media_player)*
+              *Entity which should be switched (ONLY light | switch | cover | input_boolean | automation | button | input_button | scene | script | fan | climate | media_player)*
+
+              *Entities with supported advanced settings will open it's settings page, all other entities will execute the action or toggle when clicked.*
             default: []
             selector: &home-custom-button-entity-selector
               entity:
                 filter:
                   domain:
+                    - automation
+                    - button
                     - climate
                     - cover
                     - fan
+                    - input_boolean
+                    - input_button
                     - light
                     - media_player
+                    - scene
+                    - script
+                    - switch
+
           home_custom_button01_icon:
             name: Custom button 01 - ICON (Optional)
             description: >
@@ -535,7 +545,9 @@ blueprint:
             description: >
               *HOME page*
 
-              *Entity which should be displayed (ONLY climate | cover | fan | light | media_player)*
+              *Entity which should be switched (ONLY light | switch | cover | input_boolean | automation | button | input_button | scene | script | fan | climate | media_player)*
+
+              *Entities with supported advanced settings will open it's settings page, all other entities will execute the action or toggle when clicked.*
             default: []
             selector: *home-custom-button-entity-selector
           home_custom_button02_icon:
@@ -552,7 +564,9 @@ blueprint:
             description: >
               *HOME page*
 
-              *Entity which should be displayed (ONLY climate | cover | fan | light | media_player)*
+              *Entity which should be switched (ONLY light | switch | cover | input_boolean | automation | button | input_button | scene | script | fan | climate | media_player)*
+
+              *Entities with supported advanced settings will open it's settings page, all other entities will execute the action or toggle when clicked.*
             default: []
             selector: *home-custom-button-entity-selector
           home_custom_button03_icon:
@@ -8817,6 +8831,7 @@ action:
                                   else "unknown"
                                 }}
                           - if:
+                              - '{{ entity_domain in ["climate", "cover", "fan", "light", "media_player"] }}'
                               - '{{ entity_domain != "cover" or state_attr(last_click_button.entity, "supported_features") | int(0) | bitwise_and(4) > 0 }}'
                               - '{{ entity_domain != "fan" or state_attr(last_click_button.entity, "supported_features") | int(0) | bitwise_and(1) > 0 }}'
                               - '{{ entity_domain != "light" or state_attr(last_click_button.entity, "supported_color_modes") | default("unknown") | string not in ["unknown", "onoff", enum.color_mode.unknown, enum.color_mode.onoff, "", none] }}'
@@ -8835,7 +8850,9 @@ action:
                                   entity: '{{ "embedded_climate" if last_click_button.entity == thermostat_embedded else last_click_button.entity }}'
                                   back_page: '{{ page.home }}'
                                 continue_on_error: true
-
+                            else:
+                                - *service-button_changed
+  
               ##### Versions mismatch #####
               - alias: Versions
                 conditions: