diff --git a/custom_components/tibber_prices/icons.json b/custom_components/tibber_prices/icons.json
index 498b32e..32a1608 100644
--- a/custom_components/tibber_prices/icons.json
+++ b/custom_components/tibber_prices/icons.json
@@ -16,15 +16,7 @@
       }
     },
     "get_apexcharts_yaml": {
-      "service": "mdi:chart-line",
-      "sections": {
-        "entry_id": "mdi:identifier",
-        "day": "mdi:calendar-range",
-        "level_type": "mdi:format-list-bulleted-type",
-        "resolution": "mdi:timer-sand",
-        "highlight_best_price": "mdi:battery-charging-low",
-        "highlight_peak_price": "mdi:battery-alert"
-      }
+      "service": "mdi:chart-line"
     },
     "refresh_user_data": {
       "service": "mdi:refresh"
@@ -35,6 +27,8 @@
         "search_range": "mdi:calendar-search",
         "time_alternatives": "mdi:clock-time-eight-outline",
         "price_filter": "mdi:filter-variant",
+        "search_tuning": "mdi:cog-outline",
+        "cost_estimation": "mdi:lightning-bolt",
         "output": "mdi:tune-variant"
       }
     },
@@ -44,6 +38,8 @@
         "search_range": "mdi:calendar-search",
         "time_alternatives": "mdi:clock-time-eight-outline",
         "price_filter": "mdi:filter-variant",
+        "search_tuning": "mdi:cog-outline",
+        "cost_estimation": "mdi:lightning-bolt",
         "output": "mdi:tune-variant"
       }
     },
@@ -53,6 +49,8 @@
         "search_range": "mdi:calendar-search",
         "time_alternatives": "mdi:clock-time-eight-outline",
         "price_filter": "mdi:filter-variant",
+        "search_tuning": "mdi:cog-outline",
+        "cost_estimation": "mdi:lightning-bolt",
         "output": "mdi:tune-variant"
       }
     },
@@ -62,16 +60,18 @@
         "search_range": "mdi:calendar-search",
         "time_alternatives": "mdi:clock-time-eight-outline",
         "price_filter": "mdi:filter-variant",
+        "search_tuning": "mdi:cog-outline",
+        "cost_estimation": "mdi:lightning-bolt",
         "output": "mdi:tune-variant"
       }
     },
     "find_cheapest_schedule": {
       "service": "mdi:calendar-check",
       "sections": {
-        "scheduling_options": "mdi:format-list-numbered",
         "search_range": "mdi:calendar-search",
         "time_alternatives": "mdi:clock-time-eight-outline",
         "price_filter": "mdi:filter-variant",
+        "search_tuning": "mdi:cog-outline",
         "output": "mdi:tune-variant"
       }
     }
diff --git a/custom_components/tibber_prices/services.yaml b/custom_components/tibber_prices/services.yaml
index c9f116e..1416bcd 100644
--- a/custom_components/tibber_prices/services.yaml
+++ b/custom_components/tibber_prices/services.yaml
@@ -64,7 +64,6 @@ get_apexcharts_yaml:
         boolean:
     highlight_peak_price:
       required: false
-      default: false
       example: false
       selector:
         boolean:
@@ -139,7 +138,6 @@ get_chartdata:
       fields:
         subunit_currency:
           required: false
-          default: false
           example: true
           selector:
             boolean:
@@ -163,12 +161,10 @@ get_chartdata:
               translation_key: insert_nulls
         connect_segments:
           required: false
-          default: false
           selector:
             boolean:
         add_trailing_null:
           required: false
-          default: false
           selector:
             boolean:
     format:
@@ -204,29 +200,24 @@ get_chartdata:
       fields:
         include_level:
           required: false
-          default: false
           example: true
           selector:
             boolean:
         include_rating_level:
           required: false
-          default: false
           example: true
           selector:
             boolean:
         include_average:
           required: false
-          default: false
           selector:
             boolean:
         include_energy:
           required: false
-          default: false
           selector:
             boolean:
         include_tax:
           required: false
-          default: false
           selector:
             boolean:
         start_time_field:
@@ -441,12 +432,10 @@ find_cheapest_block:
       fields:
         include_comparison_details:
           required: false
-          default: false
           selector:
             boolean:
         use_base_unit:
           required: false
-          default: false
           selector:
             boolean:
 
@@ -611,12 +600,10 @@ find_most_expensive_block:
       fields:
         include_comparison_details:
           required: false
-          default: false
           selector:
             boolean:
         use_base_unit:
           required: false
-          default: false
           selector:
             boolean:
 
@@ -785,12 +772,10 @@ find_cheapest_hours:
       fields:
         include_comparison_details:
           required: false
-          default: false
           selector:
             boolean:
         use_base_unit:
           required: false
-          default: false
           selector:
             boolean:
 
@@ -959,12 +944,10 @@ find_most_expensive_hours:
       fields:
         include_comparison_details:
           required: false
-          default: false
           selector:
             boolean:
         use_base_unit:
           required: false
-          default: false
           selector:
             boolean:
 
@@ -1118,12 +1101,10 @@ find_cheapest_schedule:
       fields:
         include_comparison_details:
           required: false
-          default: false
           selector:
             boolean:
         use_base_unit:
           required: false
-          default: false
           selector:
             boolean: