diff --git a/zhaquirks/icasa/iczb_kpd12.py b/zhaquirks/icasa/iczb_kpd12.py
index 3a0de9c391..cd5e2b3191 100644
--- a/zhaquirks/icasa/iczb_kpd12.py
+++ b/zhaquirks/icasa/iczb_kpd12.py
@@ -17,7 +17,6 @@
 
 from zhaquirks import LevelControlMoveArgumentsCache
 from zhaquirks.const import (
-    ARGS,
     CLUSTER_ID,
     COMMAND,
     COMMAND_MOVE_ON_OFF,
@@ -34,6 +33,7 @@
     LONG_RELEASE,
     MODELS_INFO,
     OUTPUT_CLUSTERS,
+    PARAMS,
     PROFILE_ID,
     SHORT_PRESS,
     TURN_OFF,
@@ -108,13 +108,13 @@ class IcasaKPD12(CustomDevice):
             COMMAND: COMMAND_MOVE_ON_OFF,
             ENDPOINT_ID: 1,
             CLUSTER_ID: 8,
-            ARGS: [0, 50],
+            PARAMS: {"move_mode": 0, "rate": 50},
         },
         (LONG_RELEASE, DIM_UP): {
             COMMAND: COMMAND_STOP,
             ENDPOINT_ID: 1,
             CLUSTER_ID: 8,
-            ARGS: [0, 50],
+            PARAMS: {"move_mode": 0, "rate": 50},
         },
         (SHORT_PRESS, TURN_OFF): {
             COMMAND: COMMAND_OFF,
@@ -125,12 +125,12 @@ class IcasaKPD12(CustomDevice):
             COMMAND: COMMAND_MOVE_ON_OFF,
             ENDPOINT_ID: 1,
             CLUSTER_ID: 8,
-            ARGS: [1, 50],
+            PARAMS: {"move_mode": 1, "rate": 50},
         },
         (LONG_RELEASE, DIM_DOWN): {
             COMMAND: COMMAND_STOP,
             ENDPOINT_ID: 1,
             CLUSTER_ID: 8,
-            ARGS: [1, 50],
+            PARAMS: {"move_mode": 1, "rate": 50},
         },
     }
diff --git a/zhaquirks/icasa/iczb_kpd14s.py b/zhaquirks/icasa/iczb_kpd14s.py
index 2507446d12..a6b2efa3cc 100644
--- a/zhaquirks/icasa/iczb_kpd14s.py
+++ b/zhaquirks/icasa/iczb_kpd14s.py
@@ -17,7 +17,6 @@
 
 from zhaquirks import LevelControlMoveArgumentsCache
 from zhaquirks.const import (
-    ARGS,
     BUTTON_1,
     BUTTON_2,
     CLUSTER_ID,
@@ -36,6 +35,7 @@
     LONG_RELEASE,
     MODELS_INFO,
     OUTPUT_CLUSTERS,
+    PARAMS,
     PROFILE_ID,
     SHORT_PRESS,
     TURN_OFF,
@@ -110,13 +110,13 @@ class IcasaKPD14S(CustomDevice):
             COMMAND: COMMAND_MOVE_ON_OFF,
             ENDPOINT_ID: 1,
             CLUSTER_ID: 8,
-            ARGS: [0, 50],
+            PARAMS: {"move_mode": 0, "rate": 50},
         },
         (LONG_RELEASE, DIM_UP): {
             COMMAND: COMMAND_STOP,
             ENDPOINT_ID: 1,
             CLUSTER_ID: 8,
-            ARGS: [0, 50],
+            PARAMS: {"move_mode": 0, "rate": 50},
         },
         (SHORT_PRESS, TURN_OFF): {
             COMMAND: COMMAND_OFF,
@@ -127,36 +127,36 @@ class IcasaKPD14S(CustomDevice):
             COMMAND: COMMAND_MOVE_ON_OFF,
             ENDPOINT_ID: 1,
             CLUSTER_ID: 8,
-            ARGS: [1, 50],
+            PARAMS: {"move_mode": 1, "rate": 50},
         },
         (LONG_RELEASE, DIM_DOWN): {
             COMMAND: COMMAND_STOP,
             ENDPOINT_ID: 1,
             CLUSTER_ID: 8,
-            ARGS: [1, 50],
+            PARAMS: {"move_mode": 1, "rate": 50},
         },
         (SHORT_PRESS, BUTTON_1): {
             COMMAND: COMMAND_RECALL,
             ENDPOINT_ID: 1,
             CLUSTER_ID: 5,
-            ARGS: [0, 1],
+            PARAMS: {"group_id": 0, "scene_id": 1},
         },
         (SHORT_PRESS, BUTTON_2): {
             COMMAND: COMMAND_RECALL,
             ENDPOINT_ID: 1,
             CLUSTER_ID: 5,
-            ARGS: [0, 2],
+            PARAMS: {"group_id": 0, "scene_id": 2},
         },
         (LONG_PRESS, BUTTON_1): {
             COMMAND: COMMAND_STORE,
             ENDPOINT_ID: 1,
             CLUSTER_ID: 5,
-            ARGS: [0, 1],
+            PARAMS: {"group_id": 0, "scene_id": 1},
         },
         (LONG_PRESS, BUTTON_2): {
             COMMAND: COMMAND_STORE,
             ENDPOINT_ID: 1,
             CLUSTER_ID: 5,
-            ARGS: [0, 2],
+            PARAMS: {"group_id": 0, "scene_id": 2},
         },
     }
diff --git a/zhaquirks/icasa/iczb_kpd18s.py b/zhaquirks/icasa/iczb_kpd18s.py
index 41c633fc76..e6fa874c95 100644
--- a/zhaquirks/icasa/iczb_kpd18s.py
+++ b/zhaquirks/icasa/iczb_kpd18s.py
@@ -18,7 +18,6 @@
 
 from zhaquirks import LevelControlMoveArgumentsCache
 from zhaquirks.const import (
-    ARGS,
     BUTTON_1,
     BUTTON_2,
     BUTTON_3,
@@ -41,6 +40,7 @@
     LONG_RELEASE,
     MODELS_INFO,
     OUTPUT_CLUSTERS,
+    PARAMS,
     PROFILE_ID,
     SHORT_PRESS,
     TURN_OFF,
@@ -115,13 +115,13 @@ class IcasaKPD18S(CustomDevice):
             COMMAND: COMMAND_MOVE_ON_OFF,
             ENDPOINT_ID: 1,
             CLUSTER_ID: 8,
-            ARGS: [0, 50],
+            PARAMS: {"move_mode": 0, "rate": 50},
         },
         (LONG_RELEASE, DIM_UP): {
             COMMAND: COMMAND_STOP,
             ENDPOINT_ID: 1,
             CLUSTER_ID: 8,
-            ARGS: [0, 50],
+            PARAMS: {"move_mode": 0, "rate": 50},
         },
         (SHORT_PRESS, TURN_OFF): {
             COMMAND: COMMAND_OFF,
@@ -132,84 +132,84 @@ class IcasaKPD18S(CustomDevice):
             COMMAND: COMMAND_MOVE_ON_OFF,
             ENDPOINT_ID: 1,
             CLUSTER_ID: 8,
-            ARGS: [1, 50],
+            PARAMS: {"move_mode": 1, "rate": 50},
         },
         (LONG_RELEASE, DIM_DOWN): {
             COMMAND: COMMAND_STOP,
             ENDPOINT_ID: 1,
             CLUSTER_ID: 8,
-            ARGS: [1, 50],
+            PARAMS: {"move_mode": 1, "rate": 50},
         },
         (SHORT_PRESS, BUTTON_1): {
             COMMAND: COMMAND_RECALL,
             ENDPOINT_ID: 1,
             CLUSTER_ID: 5,
-            ARGS: [0, 1],
+            PARAMS: {"group_id": 0, "scene_id": 1},
         },
         (SHORT_PRESS, BUTTON_2): {
             COMMAND: COMMAND_RECALL,
             ENDPOINT_ID: 1,
             CLUSTER_ID: 5,
-            ARGS: [0, 2],
+            PARAMS: {"group_id": 0, "scene_id": 2},
         },
         (SHORT_PRESS, BUTTON_3): {
             COMMAND: COMMAND_RECALL,
             ENDPOINT_ID: 1,
             CLUSTER_ID: 5,
-            ARGS: [0, 3],
+            PARAMS: {"group_id": 0, "scene_id": 3},
         },
         (SHORT_PRESS, BUTTON_4): {
             COMMAND: COMMAND_RECALL,
             ENDPOINT_ID: 1,
             CLUSTER_ID: 5,
-            ARGS: [0, 4],
+            PARAMS: {"group_id": 0, "scene_id": 4},
         },
         (SHORT_PRESS, BUTTON_5): {
             COMMAND: COMMAND_RECALL,
             ENDPOINT_ID: 1,
             CLUSTER_ID: 5,
-            ARGS: [0, 5],
+            PARAMS: {"group_id": 0, "scene_id": 5},
         },
         (SHORT_PRESS, BUTTON_6): {
             COMMAND: COMMAND_STORE,
             ENDPOINT_ID: 1,
             CLUSTER_ID: 5,
-            ARGS: [0, 6],
+            PARAMS: {"group_id": 0, "scene_id": 6},
         },
         (LONG_PRESS, BUTTON_1): {
             COMMAND: COMMAND_STORE,
             ENDPOINT_ID: 1,
             CLUSTER_ID: 5,
-            ARGS: [0, 1],
+            PARAMS: {"group_id": 0, "scene_id": 1},
         },
         (LONG_PRESS, BUTTON_2): {
             COMMAND: COMMAND_STORE,
             ENDPOINT_ID: 1,
             CLUSTER_ID: 5,
-            ARGS: [0, 2],
+            PARAMS: {"group_id": 0, "scene_id": 2},
         },
         (LONG_PRESS, BUTTON_3): {
             COMMAND: COMMAND_STORE,
             ENDPOINT_ID: 1,
             CLUSTER_ID: 5,
-            ARGS: [0, 3],
+            PARAMS: {"group_id": 0, "scene_id": 3},
         },
         (LONG_PRESS, BUTTON_4): {
             COMMAND: COMMAND_STORE,
             ENDPOINT_ID: 1,
             CLUSTER_ID: 5,
-            ARGS: [0, 4],
+            PARAMS: {"group_id": 0, "scene_id": 4},
         },
         (LONG_PRESS, BUTTON_5): {
             COMMAND: COMMAND_STORE,
             ENDPOINT_ID: 1,
             CLUSTER_ID: 5,
-            ARGS: [0, 5],
+            PARAMS: {"group_id": 0, "scene_id": 5},
         },
         (LONG_PRESS, BUTTON_6): {
             COMMAND: COMMAND_STORE,
             ENDPOINT_ID: 1,
             CLUSTER_ID: 5,
-            ARGS: [0, 6],
+            PARAMS: {"group_id": 0, "scene_id": 6},
         },
     }