diff --git a/audio/komodo/aidl_config/audio_policy_volumes.xml b/audio/komodo/aidl_config/audio_policy_volumes.xml
index 9d616610..6614d064 100644
--- a/audio/komodo/aidl_config/audio_policy_volumes.xml
+++ b/audio/komodo/aidl_config/audio_policy_volumes.xml
@@ -53,13 +53,13 @@ volume index from 0 to 100.
     </volume>
     <volume stream="AUDIO_STREAM_SYSTEM" deviceCategory="DEVICE_CATEGORY_SPEAKER">
         <point>1,-5200</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>
+        <point>13,-4455</point>
+        <point>29,-3660</point>
+        <point>43,-3165</point>
+        <point>57,-2630</point>
+        <point>71,-2400</point>
+        <point>86,-2100</point>
+        <point>100,-1720</point>
     </volume>
     <volume stream="AUDIO_STREAM_SYSTEM" deviceCategory="DEVICE_CATEGORY_EARPIECE"
                                          ref="DEFAULT_SYSTEM_VOLUME_CURVE"/>
@@ -71,12 +71,12 @@ volume index from 0 to 100.
                                        ref="DEFAULT_DEVICE_CATEGORY_HEADSET_VOLUME_CURVE"/>
     <volume stream="AUDIO_STREAM_RING" deviceCategory="DEVICE_CATEGORY_SPEAKER">
         <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>14,-3450</point>
+        <point>29,-3000</point>
+        <point>43,-2500</point>
+        <point>57,-1840</point>
+        <point>71,-1090</point>
+        <point>86,-400</point>
         <point>100,0</point>
     </volume>
     <volume stream="AUDIO_STREAM_RING" deviceCategory="DEVICE_CATEGORY_EARPIECE"
@@ -89,30 +89,30 @@ volume index from 0 to 100.
                                         ref="DEFAULT_MEDIA_VOLUME_CURVE"/>
     <volume stream="AUDIO_STREAM_MUSIC" deviceCategory="DEVICE_CATEGORY_SPEAKER">
         <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>4,-6140</point>
+        <point>8,-5854</point>
+        <point>12,-5568</point>
+        <point>16,-5255</point>
+        <point>20,-4923</point>
+        <point>24,-4543</point>
+        <point>28,-4142</point>
+        <point>32,-3895</point>
+        <point>36,-3634</point>
+        <point>40,-3364</point>
+        <point>44,-3195</point>
+        <point>48,-2996</point>
+        <point>52,-2773</point>
+        <point>56,-2584</point>
+        <point>60,-2407</point>
+        <point>64,-2234</point>
+        <point>68,-2039</point>
+        <point>72,-1914</point>
+        <point>76,-1787</point>
+        <point>80,-1612</point>
+        <point>84,-1333</point>
+        <point>88,-1030</point>
+        <point>92,-698</point>
+        <point>96,-312</point>
         <point>100,0</point>
     </volume>
     <volume stream="AUDIO_STREAM_MUSIC" deviceCategory="DEVICE_CATEGORY_EARPIECE"
@@ -124,12 +124,12 @@ 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,-5950</point>
-        <point>17,-4450</point>
-        <point>33,-2800</point>
-        <point>50,-1900</point>
-        <point>67,-1000</point>
-        <point>83,-330</point>
+        <point>0,-5510</point>
+        <point>17,-4660</point>
+        <point>33,-3000</point>
+        <point>50,-2000</point>
+        <point>67,-890</point>
+        <point>83,-270</point>
         <point>100,0</point>
     </volume>
     <volume stream="AUDIO_STREAM_ALARM" deviceCategory="DEVICE_CATEGORY_EARPIECE"
@@ -141,14 +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,-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>
+        <point>1,-4700</point>
+        <point>13,-4380</point>
+        <point>29,-3680</point>
+        <point>43,-3130</point>
+        <point>57,-2490</point>
+        <point>71,-1900</point>
+        <point>86,-1340</point>
+        <point>100,-680</point>
     </volume>
     <volume stream="AUDIO_STREAM_NOTIFICATION" deviceCategory="DEVICE_CATEGORY_EARPIECE"
                                                ref="DEFAULT_DEVICE_CATEGORY_EARPIECE_VOLUME_CURVE"/>
@@ -186,13 +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,-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>
+        <point>13,-4455</point>
+        <point>29,-3660</point>
+        <point>43,-3165</point>
+        <point>57,-2630</point>
+        <point>71,-2400</point>
+        <point>86,-2100</point>
+        <point>100,-1720</point>
     </volume>
     <volume stream="AUDIO_STREAM_ENFORCED_AUDIBLE" deviceCategory="DEVICE_CATEGORY_EARPIECE"
                                                    ref="DEFAULT_SYSTEM_VOLUME_CURVE"/>
@@ -208,13 +208,13 @@ volume index from 0 to 100.
     </volume>
     <volume stream="AUDIO_STREAM_DTMF" deviceCategory="DEVICE_CATEGORY_SPEAKER">
         <point>1,-6600</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>
+        <point>14,-5440</point>
+        <point>29,-4740</point>
+        <point>43,-3850</point>
+        <point>57,-3520</point>
+        <point>71,-2900</point>
+        <point>85,-2470</point>
+        <point>100,-2038</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 3f82d3c9..c335a34d 100644
Binary files a/audio/komodo/tuning/waves/waves_preset.mps and b/audio/komodo/tuning/waves/waves_preset.mps differ