diff --git a/audio/caiman/aidl_config/audio_policy_volumes.xml b/audio/caiman/aidl_config/audio_policy_volumes.xml
index 4357dadf..fe0fd2ac 100644
--- a/audio/caiman/aidl_config/audio_policy_volumes.xml
+++ b/audio/caiman/aidl_config/audio_policy_volumes.xml
@@ -52,12 +52,14 @@ volume index from 0 to 100.
         <point>100,-1800</point>
     </volume>
     <volume stream="AUDIO_STREAM_SYSTEM" deviceCategory="DEVICE_CATEGORY_SPEAKER">
-        <point>1,-4500</point>
-        <point>29,-3400</point>
-        <point>57,-2250</point>
-        <point>71,-1900</point>
-        <point>86,-1530</point>
-        <point>100,-1100</point>
+        <point>1,-6600</point>
+        <point>13,-6180</point>
+        <point>29,-5350</point>
+        <point>43,-4650</point>
+        <point>57,-3850</point>
+        <point>71,-3650</point>
+        <point>86,-3250</point>
+        <point>100,-2850</point>
     </volume>
     <volume stream="AUDIO_STREAM_SYSTEM" deviceCategory="DEVICE_CATEGORY_EARPIECE"
                                          ref="DEFAULT_SYSTEM_VOLUME_CURVE"/>
@@ -68,13 +70,13 @@ volume index from 0 to 100.
     <volume stream="AUDIO_STREAM_RING" deviceCategory="DEVICE_CATEGORY_HEADSET"
                                        ref="DEFAULT_DEVICE_CATEGORY_HEADSET_VOLUME_CURVE"/>
     <volume stream="AUDIO_STREAM_RING" deviceCategory="DEVICE_CATEGORY_SPEAKER">
-        <point>1,-4000</point>
-        <point>29,-2950</point>
-        <point>43,-2350</point>
-        <point>57,-1850</point>
-        <point>71,-1400</point>
-        <point>86,-700</point>
-        <point>100,0</point>
+        <point>1,-4700</point>
+        <point>29,-3670</point>
+        <point>43,-3170</point>
+        <point>57,-2550</point>
+        <point>71,-1780</point>
+        <point>86,-480</point>
+        <point>100,-300</point>
     </volume>
     <volume stream="AUDIO_STREAM_RING" deviceCategory="DEVICE_CATEGORY_EARPIECE"
                                        ref="DEFAULT_DEVICE_CATEGORY_EARPIECE_VOLUME_CURVE"/>
@@ -86,28 +88,28 @@ volume index from 0 to 100.
                                         ref="DEFAULT_MEDIA_VOLUME_CURVE"/>
     <volume stream="AUDIO_STREAM_MUSIC" deviceCategory="DEVICE_CATEGORY_SPEAKER">
         <point>1,-9999</point>
-        <point>4,-6350</point>
-        <point>8,-5940</point>
-        <point>12,-5587</point>
-        <point>16,-5222</point>
-        <point>20,-4923</point>
-        <point>24,-4602</point>
-        <point>28,-4299</point>
-        <point>32,-4027</point>
-        <point>36,-3789</point>
-        <point>40,-3548</point>
-        <point>44,-3292</point>
-        <point>48,-3004</point>
-        <point>52,-2699</point>
-        <point>56,-2389</point>
-        <point>60,-2154</point>
-        <point>64,-1941</point>
-        <point>68,-1744</point>
-        <point>72,-1555</point>
-        <point>76,-1374</point>
-        <point>80,-1070</point>
-        <point>84,-915</point>
-        <point>88,-590</point>
+        <point>4,-5770</point>
+        <point>8,-5459</point>
+        <point>12,-5150</point>
+        <point>16,-5000</point>
+        <point>20,-4735</point>
+        <point>24,-4400</point>
+        <point>28,-4130</point>
+        <point>32,-3875</point>
+        <point>36,-3609</point>
+        <point>40,-3400</point>
+        <point>44,-3165</point>
+        <point>48,-2915</point>
+        <point>52,-2716</point>
+        <point>56,-2363</point>
+        <point>60,-2168</point>
+        <point>64,-1944</point>
+        <point>68,-1719</point>
+        <point>72,-1455</point>
+        <point>76,-1260</point>
+        <point>80,-1080</point>
+        <point>84,-900</point>
+        <point>88,-555</point>
         <point>92,-392</point>
         <point>96,-194</point>
         <point>100,0</point>
@@ -121,12 +123,13 @@ volume index from 0 to 100.
     <volume stream="AUDIO_STREAM_ALARM" deviceCategory="DEVICE_CATEGORY_HEADSET"
                                         ref="DEFAULT_NON_MUTABLE_HEADSET_VOLUME_CURVE"/>
     <volume stream="AUDIO_STREAM_ALARM" deviceCategory="DEVICE_CATEGORY_SPEAKER">
-        <point>0,-5600</point>
-        <point>29,-3520</point>
-        <point>57,-1500</point>
-        <point>71,-1150</point>
-        <point>86,-500</point>
-        <point>100,0</point>
+        <point>0,-6660</point>
+        <point>17,-5250</point>
+        <point>33,-3500</point>
+        <point>50,-2480</point>
+        <point>67,-1280</point>
+        <point>83,-560</point>
+        <point>100,-220</point>
     </volume>
     <volume stream="AUDIO_STREAM_ALARM" deviceCategory="DEVICE_CATEGORY_EARPIECE"
                                         ref="DEFAULT_NON_MUTABLE_EARPIECE_VOLUME_CURVE"/>
@@ -137,11 +140,14 @@ volume index from 0 to 100.
     <volume stream="AUDIO_STREAM_NOTIFICATION" deviceCategory="DEVICE_CATEGORY_HEADSET"
                                                ref="DEFAULT_DEVICE_CATEGORY_HEADSET_VOLUME_CURVE"/>
     <volume stream="AUDIO_STREAM_NOTIFICATION" deviceCategory="DEVICE_CATEGORY_SPEAKER">
-        <point>1,-4500</point>
-        <point>29,-3800</point>
-        <point>71,-1850</point>
-        <point>86,-1000</point>
-        <point>100,-500</point>
+        <point>1,-5700</point>
+        <point>14,-5020</point>
+        <point>29,-4280</point>
+        <point>43,-3750</point>
+        <point>57,-3150</point>
+        <point>71,-2550</point>
+        <point>86,-2050</point>
+        <point>100,-1200</point>
     </volume>
     <volume stream="AUDIO_STREAM_NOTIFICATION" deviceCategory="DEVICE_CATEGORY_EARPIECE"
                                                ref="DEFAULT_DEVICE_CATEGORY_EARPIECE_VOLUME_CURVE"/>
@@ -178,12 +184,14 @@ volume index from 0 to 100.
         <point>100,-1800</point>
     </volume>
     <volume stream="AUDIO_STREAM_ENFORCED_AUDIBLE" deviceCategory="DEVICE_CATEGORY_SPEAKER">
-        <point>1,-4500</point>
-        <point>29,-3400</point>
-        <point>57,-2250</point>
-        <point>71,-1900</point>
-        <point>86,-1530</point>
-        <point>100,-1100</point>
+        <point>1,-6600</point>
+        <point>13,-6180</point>
+        <point>29,-5350</point>
+        <point>43,-4650</point>
+        <point>57,-3850</point>
+        <point>71,-3650</point>
+        <point>86,-3250</point>
+        <point>100,-2850</point>
     </volume>
     <volume stream="AUDIO_STREAM_ENFORCED_AUDIBLE" deviceCategory="DEVICE_CATEGORY_EARPIECE"
                                                    ref="DEFAULT_SYSTEM_VOLUME_CURVE"/>
@@ -198,12 +206,14 @@ volume index from 0 to 100.
         <point>100,-1800</point>
     </volume>
     <volume stream="AUDIO_STREAM_DTMF" deviceCategory="DEVICE_CATEGORY_SPEAKER">
-        <point>1,-5700</point>
-        <point>29,-4230</point>
-        <point>43,-3300</point>
-        <point>57,-3100</point>
-        <point>71,-2500</point>
-        <point>100,-1400</point>
+        <point>1,-6600</point>
+        <point>14,-6000</point>
+        <point>29,-5180</point>
+        <point>43,-4300</point>
+        <point>57,-3950</point>
+        <point>71,-3340</point>
+        <point>85,-2750</point>
+        <point>100,-2300</point>
     </volume>
     <volume stream="AUDIO_STREAM_DTMF" deviceCategory="DEVICE_CATEGORY_EARPIECE"
                                        ref="DEFAULT_SYSTEM_VOLUME_CURVE"/>
diff --git a/audio/caiman/tuning/waves/waves_preset.mps b/audio/caiman/tuning/waves/waves_preset.mps
index df81eeb7..f07d0bcb 100644
Binary files a/audio/caiman/tuning/waves/waves_preset.mps and b/audio/caiman/tuning/waves/waves_preset.mps differ
diff --git a/audio/komodo/aidl_config/audio_policy_volumes.xml b/audio/komodo/aidl_config/audio_policy_volumes.xml
index df28ead6..9d616610 100644
--- a/audio/komodo/aidl_config/audio_policy_volumes.xml
+++ b/audio/komodo/aidl_config/audio_policy_volumes.xml
@@ -53,12 +53,13 @@ volume index from 0 to 100.
     </volume>
     <volume stream="AUDIO_STREAM_SYSTEM" deviceCategory="DEVICE_CATEGORY_SPEAKER">
         <point>1,-5200</point>
-        <point>13,-5000</point>
-        <point>28,-4400</point>
-        <point>56,-3380</point>
-        <point>71,-3120</point>
-        <point>85,-2750</point>
-        <point>100,-2150</point>
+        <point>13,-4150</point>
+        <point>29,-3400</point>
+        <point>43,-2870</point>
+        <point>57,-2350</point>
+        <point>71,-2100</point>
+        <point>86,-1780</point>
+        <point>100,-1420</point>
     </volume>
     <volume stream="AUDIO_STREAM_SYSTEM" deviceCategory="DEVICE_CATEGORY_EARPIECE"
                                          ref="DEFAULT_SYSTEM_VOLUME_CURVE"/>
@@ -69,11 +70,14 @@ volume index from 0 to 100.
     <volume stream="AUDIO_STREAM_RING" deviceCategory="DEVICE_CATEGORY_HEADSET"
                                        ref="DEFAULT_DEVICE_CATEGORY_HEADSET_VOLUME_CURVE"/>
     <volume stream="AUDIO_STREAM_RING" deviceCategory="DEVICE_CATEGORY_SPEAKER">
-        <point>1,-4935</point>
-        <point>14,-3220</point>
-        <point>28,-2910</point>
-        <point>71,-1450</point>
-        <point>100,-110</point>
+        <point>1,-4250</point>
+        <point>14,-3200</point>
+        <point>29,-2800</point>
+        <point>43,-2250</point>
+        <point>57,-1750</point>
+        <point>71,-1050</point>
+        <point>86,-280</point>
+        <point>100,0</point>
     </volume>
     <volume stream="AUDIO_STREAM_RING" deviceCategory="DEVICE_CATEGORY_EARPIECE"
                                        ref="DEFAULT_DEVICE_CATEGORY_EARPIECE_VOLUME_CURVE"/>
@@ -84,31 +88,31 @@ volume index from 0 to 100.
     <volume stream="AUDIO_STREAM_MUSIC" deviceCategory="DEVICE_CATEGORY_HEADSET"
                                         ref="DEFAULT_MEDIA_VOLUME_CURVE"/>
     <volume stream="AUDIO_STREAM_MUSIC" deviceCategory="DEVICE_CATEGORY_SPEAKER">
-        <point>1,-6900</point>
-        <point>4,-6380</point>
-        <point>8,-6140</point>
-        <point>12,-5785</point>
-        <point>16,-5450</point>
-        <point>20,-5120</point>
-        <point>24,-4738</point>
-        <point>28,-4400</point>
-        <point>32,-4188</point>
-        <point>36,-3960</point>
-        <point>40,-3700</point>
-        <point>44,-3495</point>
-        <point>48,-3257</point>
-        <point>52,-3015</point>
-        <point>56,-2739</point>
-        <point>60,-2600</point>
-        <point>64,-2340</point>
-        <point>68,-2070</point>
-        <point>72,-1865</point>
-        <point>76,-1717</point>
-        <point>80,-1475</point>
-        <point>84,-1229</point>
-        <point>88,-1070</point>
-        <point>92,-556</point>
-        <point>96,-239</point>
+        <point>1,-6500</point>
+        <point>4,-5917</point>
+        <point>8,-5660</point>
+        <point>12,-5361</point>
+        <point>16,-5050</point>
+        <point>20,-4735</point>
+        <point>24,-4367</point>
+        <point>28,-4014</point>
+        <point>32,-3805</point>
+        <point>36,-3574</point>
+        <point>40,-3354</point>
+        <point>44,-3154</point>
+        <point>48,-2946</point>
+        <point>52,-2701</point>
+        <point>56,-2497</point>
+        <point>60,-2314</point>
+        <point>64,-2126</point>
+        <point>68,-1931</point>
+        <point>72,-1786</point>
+        <point>76,-1633</point>
+        <point>80,-1370</point>
+        <point>84,-1175</point>
+        <point>88,-866</point>
+        <point>92,-579</point>
+        <point>96,-232</point>
         <point>100,0</point>
     </volume>
     <volume stream="AUDIO_STREAM_MUSIC" deviceCategory="DEVICE_CATEGORY_EARPIECE"
@@ -120,11 +124,13 @@ volume index from 0 to 100.
     <volume stream="AUDIO_STREAM_ALARM" deviceCategory="DEVICE_CATEGORY_HEADSET"
                                         ref="DEFAULT_NON_MUTABLE_HEADSET_VOLUME_CURVE"/>
     <volume stream="AUDIO_STREAM_ALARM" deviceCategory="DEVICE_CATEGORY_SPEAKER">
-        <point>0,-5600</point>
-        <point>14,-4670</point>
-        <point>28,-3060</point>
-        <point>71,-1050</point>
-        <point>100,-100</point>
+        <point>0,-5950</point>
+        <point>17,-4450</point>
+        <point>33,-2800</point>
+        <point>50,-1900</point>
+        <point>67,-1000</point>
+        <point>83,-330</point>
+        <point>100,0</point>
     </volume>
     <volume stream="AUDIO_STREAM_ALARM" deviceCategory="DEVICE_CATEGORY_EARPIECE"
                                         ref="DEFAULT_NON_MUTABLE_EARPIECE_VOLUME_CURVE"/>
@@ -135,12 +141,14 @@ volume index from 0 to 100.
     <volume stream="AUDIO_STREAM_NOTIFICATION" deviceCategory="DEVICE_CATEGORY_HEADSET"
                                                ref="DEFAULT_DEVICE_CATEGORY_HEADSET_VOLUME_CURVE"/>
     <volume stream="AUDIO_STREAM_NOTIFICATION" deviceCategory="DEVICE_CATEGORY_SPEAKER">
-        <point>1,-6350</point>
-        <point>14,-4300</point>
-        <point>28,-3710</point>
-        <point>66,-2100</point>
-        <point>85,-1550</point>
-        <point>100,-480</point>
+        <point>1,-4800</point>
+        <point>14,-4350</point>
+        <point>29,-3700</point>
+        <point>43,-3050</point>
+        <point>57,-2400</point>
+        <point>71,-1850</point>
+        <point>86,-1200</point>
+        <point>100,-500</point>
     </volume>
     <volume stream="AUDIO_STREAM_NOTIFICATION" deviceCategory="DEVICE_CATEGORY_EARPIECE"
                                                ref="DEFAULT_DEVICE_CATEGORY_EARPIECE_VOLUME_CURVE"/>
@@ -178,12 +186,13 @@ volume index from 0 to 100.
     </volume>
     <volume stream="AUDIO_STREAM_ENFORCED_AUDIBLE" deviceCategory="DEVICE_CATEGORY_SPEAKER">
         <point>1,-5200</point>
-        <point>13,-5000</point>
-        <point>28,-4400</point>
-        <point>56,-3380</point>
-        <point>71,-3120</point>
-        <point>85,-2750</point>
-        <point>100,-2150</point>
+        <point>13,-4150</point>
+        <point>29,-3400</point>
+        <point>43,-2870</point>
+        <point>57,-2350</point>
+        <point>71,-2100</point>
+        <point>86,-1780</point>
+        <point>100,-1420</point>
     </volume>
     <volume stream="AUDIO_STREAM_ENFORCED_AUDIBLE" deviceCategory="DEVICE_CATEGORY_EARPIECE"
                                                    ref="DEFAULT_SYSTEM_VOLUME_CURVE"/>
@@ -199,11 +208,13 @@ volume index from 0 to 100.
     </volume>
     <volume stream="AUDIO_STREAM_DTMF" deviceCategory="DEVICE_CATEGORY_SPEAKER">
         <point>1,-6600</point>
-        <point>13,-6220</point>
-        <point>28,-5500</point>
-        <point>42,-4600</point>
-        <point>57,-4250</point>
-        <point>100,-2780</point>
+        <point>14,-5250</point>
+        <point>29,-4500</point>
+        <point>43,-3600</point>
+        <point>57,-3230</point>
+        <point>71,-2750</point>
+        <point>85,-2300</point>
+        <point>100,-1900</point>
     </volume>
     <volume stream="AUDIO_STREAM_DTMF" deviceCategory="DEVICE_CATEGORY_EARPIECE"
                                        ref="DEFAULT_SYSTEM_VOLUME_CURVE"/>
diff --git a/audio/komodo/tuning/waves/waves_preset.mps b/audio/komodo/tuning/waves/waves_preset.mps
index d7b2b571..3f82d3c9 100644
Binary files a/audio/komodo/tuning/waves/waves_preset.mps and b/audio/komodo/tuning/waves/waves_preset.mps differ
diff --git a/audio/tokay/aidl_config/audio_policy_volumes.xml b/audio/tokay/aidl_config/audio_policy_volumes.xml
index 4357dadf..fe0fd2ac 100644
--- a/audio/tokay/aidl_config/audio_policy_volumes.xml
+++ b/audio/tokay/aidl_config/audio_policy_volumes.xml
@@ -52,12 +52,14 @@ volume index from 0 to 100.
         <point>100,-1800</point>
     </volume>
     <volume stream="AUDIO_STREAM_SYSTEM" deviceCategory="DEVICE_CATEGORY_SPEAKER">
-        <point>1,-4500</point>
-        <point>29,-3400</point>
-        <point>57,-2250</point>
-        <point>71,-1900</point>
-        <point>86,-1530</point>
-        <point>100,-1100</point>
+        <point>1,-6600</point>
+        <point>13,-6180</point>
+        <point>29,-5350</point>
+        <point>43,-4650</point>
+        <point>57,-3850</point>
+        <point>71,-3650</point>
+        <point>86,-3250</point>
+        <point>100,-2850</point>
     </volume>
     <volume stream="AUDIO_STREAM_SYSTEM" deviceCategory="DEVICE_CATEGORY_EARPIECE"
                                          ref="DEFAULT_SYSTEM_VOLUME_CURVE"/>
@@ -68,13 +70,13 @@ volume index from 0 to 100.
     <volume stream="AUDIO_STREAM_RING" deviceCategory="DEVICE_CATEGORY_HEADSET"
                                        ref="DEFAULT_DEVICE_CATEGORY_HEADSET_VOLUME_CURVE"/>
     <volume stream="AUDIO_STREAM_RING" deviceCategory="DEVICE_CATEGORY_SPEAKER">
-        <point>1,-4000</point>
-        <point>29,-2950</point>
-        <point>43,-2350</point>
-        <point>57,-1850</point>
-        <point>71,-1400</point>
-        <point>86,-700</point>
-        <point>100,0</point>
+        <point>1,-4700</point>
+        <point>29,-3670</point>
+        <point>43,-3170</point>
+        <point>57,-2550</point>
+        <point>71,-1780</point>
+        <point>86,-480</point>
+        <point>100,-300</point>
     </volume>
     <volume stream="AUDIO_STREAM_RING" deviceCategory="DEVICE_CATEGORY_EARPIECE"
                                        ref="DEFAULT_DEVICE_CATEGORY_EARPIECE_VOLUME_CURVE"/>
@@ -86,28 +88,28 @@ volume index from 0 to 100.
                                         ref="DEFAULT_MEDIA_VOLUME_CURVE"/>
     <volume stream="AUDIO_STREAM_MUSIC" deviceCategory="DEVICE_CATEGORY_SPEAKER">
         <point>1,-9999</point>
-        <point>4,-6350</point>
-        <point>8,-5940</point>
-        <point>12,-5587</point>
-        <point>16,-5222</point>
-        <point>20,-4923</point>
-        <point>24,-4602</point>
-        <point>28,-4299</point>
-        <point>32,-4027</point>
-        <point>36,-3789</point>
-        <point>40,-3548</point>
-        <point>44,-3292</point>
-        <point>48,-3004</point>
-        <point>52,-2699</point>
-        <point>56,-2389</point>
-        <point>60,-2154</point>
-        <point>64,-1941</point>
-        <point>68,-1744</point>
-        <point>72,-1555</point>
-        <point>76,-1374</point>
-        <point>80,-1070</point>
-        <point>84,-915</point>
-        <point>88,-590</point>
+        <point>4,-5770</point>
+        <point>8,-5459</point>
+        <point>12,-5150</point>
+        <point>16,-5000</point>
+        <point>20,-4735</point>
+        <point>24,-4400</point>
+        <point>28,-4130</point>
+        <point>32,-3875</point>
+        <point>36,-3609</point>
+        <point>40,-3400</point>
+        <point>44,-3165</point>
+        <point>48,-2915</point>
+        <point>52,-2716</point>
+        <point>56,-2363</point>
+        <point>60,-2168</point>
+        <point>64,-1944</point>
+        <point>68,-1719</point>
+        <point>72,-1455</point>
+        <point>76,-1260</point>
+        <point>80,-1080</point>
+        <point>84,-900</point>
+        <point>88,-555</point>
         <point>92,-392</point>
         <point>96,-194</point>
         <point>100,0</point>
@@ -121,12 +123,13 @@ volume index from 0 to 100.
     <volume stream="AUDIO_STREAM_ALARM" deviceCategory="DEVICE_CATEGORY_HEADSET"
                                         ref="DEFAULT_NON_MUTABLE_HEADSET_VOLUME_CURVE"/>
     <volume stream="AUDIO_STREAM_ALARM" deviceCategory="DEVICE_CATEGORY_SPEAKER">
-        <point>0,-5600</point>
-        <point>29,-3520</point>
-        <point>57,-1500</point>
-        <point>71,-1150</point>
-        <point>86,-500</point>
-        <point>100,0</point>
+        <point>0,-6660</point>
+        <point>17,-5250</point>
+        <point>33,-3500</point>
+        <point>50,-2480</point>
+        <point>67,-1280</point>
+        <point>83,-560</point>
+        <point>100,-220</point>
     </volume>
     <volume stream="AUDIO_STREAM_ALARM" deviceCategory="DEVICE_CATEGORY_EARPIECE"
                                         ref="DEFAULT_NON_MUTABLE_EARPIECE_VOLUME_CURVE"/>
@@ -137,11 +140,14 @@ volume index from 0 to 100.
     <volume stream="AUDIO_STREAM_NOTIFICATION" deviceCategory="DEVICE_CATEGORY_HEADSET"
                                                ref="DEFAULT_DEVICE_CATEGORY_HEADSET_VOLUME_CURVE"/>
     <volume stream="AUDIO_STREAM_NOTIFICATION" deviceCategory="DEVICE_CATEGORY_SPEAKER">
-        <point>1,-4500</point>
-        <point>29,-3800</point>
-        <point>71,-1850</point>
-        <point>86,-1000</point>
-        <point>100,-500</point>
+        <point>1,-5700</point>
+        <point>14,-5020</point>
+        <point>29,-4280</point>
+        <point>43,-3750</point>
+        <point>57,-3150</point>
+        <point>71,-2550</point>
+        <point>86,-2050</point>
+        <point>100,-1200</point>
     </volume>
     <volume stream="AUDIO_STREAM_NOTIFICATION" deviceCategory="DEVICE_CATEGORY_EARPIECE"
                                                ref="DEFAULT_DEVICE_CATEGORY_EARPIECE_VOLUME_CURVE"/>
@@ -178,12 +184,14 @@ volume index from 0 to 100.
         <point>100,-1800</point>
     </volume>
     <volume stream="AUDIO_STREAM_ENFORCED_AUDIBLE" deviceCategory="DEVICE_CATEGORY_SPEAKER">
-        <point>1,-4500</point>
-        <point>29,-3400</point>
-        <point>57,-2250</point>
-        <point>71,-1900</point>
-        <point>86,-1530</point>
-        <point>100,-1100</point>
+        <point>1,-6600</point>
+        <point>13,-6180</point>
+        <point>29,-5350</point>
+        <point>43,-4650</point>
+        <point>57,-3850</point>
+        <point>71,-3650</point>
+        <point>86,-3250</point>
+        <point>100,-2850</point>
     </volume>
     <volume stream="AUDIO_STREAM_ENFORCED_AUDIBLE" deviceCategory="DEVICE_CATEGORY_EARPIECE"
                                                    ref="DEFAULT_SYSTEM_VOLUME_CURVE"/>
@@ -198,12 +206,14 @@ volume index from 0 to 100.
         <point>100,-1800</point>
     </volume>
     <volume stream="AUDIO_STREAM_DTMF" deviceCategory="DEVICE_CATEGORY_SPEAKER">
-        <point>1,-5700</point>
-        <point>29,-4230</point>
-        <point>43,-3300</point>
-        <point>57,-3100</point>
-        <point>71,-2500</point>
-        <point>100,-1400</point>
+        <point>1,-6600</point>
+        <point>14,-6000</point>
+        <point>29,-5180</point>
+        <point>43,-4300</point>
+        <point>57,-3950</point>
+        <point>71,-3340</point>
+        <point>85,-2750</point>
+        <point>100,-2300</point>
     </volume>
     <volume stream="AUDIO_STREAM_DTMF" deviceCategory="DEVICE_CATEGORY_EARPIECE"
                                        ref="DEFAULT_SYSTEM_VOLUME_CURVE"/>
diff --git a/audio/tokay/tuning/waves/waves_preset.mps b/audio/tokay/tuning/waves/waves_preset.mps
index df81eeb7..f07d0bcb 100644
Binary files a/audio/tokay/tuning/waves/waves_preset.mps and b/audio/tokay/tuning/waves/waves_preset.mps differ