diff --git a/audio/caiman/aidl_config/audio_policy_volumes.xml b/audio/caiman/aidl_config/audio_policy_volumes.xml
index 4f24a35b..4357dadf 100644
--- a/audio/caiman/aidl_config/audio_policy_volumes.xml
+++ b/audio/caiman/aidl_config/audio_policy_volumes.xml
@@ -85,31 +85,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,-9000</point>
-        <point>4,-6370</point>
-        <point>8,-6105</point>
-        <point>12,-5810</point>
-        <point>16,-5520</point>
-        <point>20,-5220</point>
-        <point>24,-4870</point>
-        <point>28,-4490</point>
-        <point>32,-4278</point>
-        <point>36,-4027</point>
-        <point>40,-3770</point>
-        <point>44,-3560</point>
-        <point>48,-3300</point>
-        <point>52,-3080</point>
-        <point>56,-2800</point>
-        <point>60,-2620</point>
-        <point>64,-2350</point>
-        <point>68,-2200</point>
-        <point>72,-2100</point>
-        <point>76,-1930</point>
-        <point>80,-1700</point>
-        <point>84,-1460</point>
-        <point>88,-1190</point>
-        <point>92,-850</point>
-        <point>96,-510</point>
+        <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>92,-392</point>
+        <point>96,-194</point>
         <point>100,0</point>
     </volume>
     <volume stream="AUDIO_STREAM_MUSIC" deviceCategory="DEVICE_CATEGORY_EARPIECE"
diff --git a/audio/caiman/tuning/waves/waves_preset.mps b/audio/caiman/tuning/waves/waves_preset.mps
index 62a00aa7..df81eeb7 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 6bdb0d11..df28ead6 100644
--- a/audio/komodo/aidl_config/audio_policy_volumes.xml
+++ b/audio/komodo/aidl_config/audio_policy_volumes.xml
@@ -70,10 +70,10 @@ volume index from 0 to 100.
                                        ref="DEFAULT_DEVICE_CATEGORY_HEADSET_VOLUME_CURVE"/>
     <volume stream="AUDIO_STREAM_RING" deviceCategory="DEVICE_CATEGORY_SPEAKER">
         <point>1,-4935</point>
-        <point>14,-3320</point>
-        <point>28,-2960</point>
-        <point>71,-1400</point>
-        <point>100,0</point>
+        <point>14,-3220</point>
+        <point>28,-2910</point>
+        <point>71,-1450</point>
+        <point>100,-110</point>
     </volume>
     <volume stream="AUDIO_STREAM_RING" deviceCategory="DEVICE_CATEGORY_EARPIECE"
                                        ref="DEFAULT_DEVICE_CATEGORY_EARPIECE_VOLUME_CURVE"/>
@@ -84,31 +84,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,-6100</point>
-        <point>4,-5910</point>
-        <point>8,-5634</point>
-        <point>12,-5300</point>
-        <point>16,-4995</point>
-        <point>20,-4670</point>
-        <point>24,-4300</point>
-        <point>28,-3944</point>
-        <point>32,-3705</point>
-        <point>36,-3472</point>
-        <point>40,-3200</point>
-        <point>44,-3020</point>
-        <point>48,-2800</point>
-        <point>52,-2575</point>
-        <point>56,-2300</point>
-        <point>60,-2130</point>
-        <point>64,-1925</point>
-        <point>68,-1710</point>
-        <point>72,-1600</point>
-        <point>76,-1500</point>
-        <point>80,-1375</point>
-        <point>84,-1277</point>
-        <point>88,-991</point>
-        <point>92,-741</point>
-        <point>96,-475</point>
+        <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>100,0</point>
     </volume>
     <volume stream="AUDIO_STREAM_MUSIC" deviceCategory="DEVICE_CATEGORY_EARPIECE"
@@ -140,7 +140,7 @@ volume index from 0 to 100.
         <point>28,-3710</point>
         <point>66,-2100</point>
         <point>85,-1550</point>
-        <point>100,-780</point>
+        <point>100,-480</point>
     </volume>
     <volume stream="AUDIO_STREAM_NOTIFICATION" deviceCategory="DEVICE_CATEGORY_EARPIECE"
                                                ref="DEFAULT_DEVICE_CATEGORY_EARPIECE_VOLUME_CURVE"/>
diff --git a/audio/komodo/tuning/waves/waves_preset.mps b/audio/komodo/tuning/waves/waves_preset.mps
index 619bd74d..d7b2b571 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 4f24a35b..4357dadf 100644
--- a/audio/tokay/aidl_config/audio_policy_volumes.xml
+++ b/audio/tokay/aidl_config/audio_policy_volumes.xml
@@ -85,31 +85,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,-9000</point>
-        <point>4,-6370</point>
-        <point>8,-6105</point>
-        <point>12,-5810</point>
-        <point>16,-5520</point>
-        <point>20,-5220</point>
-        <point>24,-4870</point>
-        <point>28,-4490</point>
-        <point>32,-4278</point>
-        <point>36,-4027</point>
-        <point>40,-3770</point>
-        <point>44,-3560</point>
-        <point>48,-3300</point>
-        <point>52,-3080</point>
-        <point>56,-2800</point>
-        <point>60,-2620</point>
-        <point>64,-2350</point>
-        <point>68,-2200</point>
-        <point>72,-2100</point>
-        <point>76,-1930</point>
-        <point>80,-1700</point>
-        <point>84,-1460</point>
-        <point>88,-1190</point>
-        <point>92,-850</point>
-        <point>96,-510</point>
+        <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>92,-392</point>
+        <point>96,-194</point>
         <point>100,0</point>
     </volume>
     <volume stream="AUDIO_STREAM_MUSIC" deviceCategory="DEVICE_CATEGORY_EARPIECE"
diff --git a/audio/tokay/tuning/waves/waves_preset.mps b/audio/tokay/tuning/waves/waves_preset.mps
index 62a00aa7..df81eeb7 100644
Binary files a/audio/tokay/tuning/waves/waves_preset.mps and b/audio/tokay/tuning/waves/waves_preset.mps differ