Updated icons, buttons, and display; issues still with Main Room button, and sliders.

main/api/ha_template.h

@@ -24,8 +24,8 @@
 
 /* Emits the entity list for the lights loop, in HA_LIGHT_LIST order. The
  * trailing comma is deliberate -- Jinja accepts it, and it avoids a
- * last-element special case. */
-#define HA_TMPL_LIGHT_X(id, label, dimmable) "'" id "',"
+ * last-element special case. The icon argument is the UI layer's. */
+#define HA_TMPL_LIGHT_X(id, label, dimmable, icon) "'" id "',"
 
 /*
  * num()     -- a state as a number, or null if it is not one ("unavailable",