diff --git a/audio/oriole/config/audio_policy_volumes.xml b/audio/oriole/config/audio_policy_volumes.xml
index db57662..a58e237 100644
--- a/audio/oriole/config/audio_policy_volumes.xml
+++ b/audio/oriole/config/audio_policy_volumes.xml
@@ -52,10 +52,10 @@ volume index from 0 to 100.
         <point>100,-1800</point>
     </volume>
     <volume stream="AUDIO_STREAM_SYSTEM" deviceCategory="DEVICE_CATEGORY_SPEAKER">
-        <point>0,-4200</point>
-        <point>33,-2800</point>
-        <point>66,-1400</point>
-        <point>100,0</point>
+        <point>1,-4500</point>
+        <point>33,-3000</point>
+        <point>66,-2000</point>
+        <point>100,-800</point>
     </volume>
     <volume stream="AUDIO_STREAM_SYSTEM" deviceCategory="DEVICE_CATEGORY_EARPIECE"
                                          ref="DEFAULT_SYSTEM_VOLUME_CURVE"/>
@@ -143,8 +143,12 @@ volume index from 0 to 100.
         <point>66,-2200</point>
         <point>100,-1800</point>
     </volume>
-    <volume stream="AUDIO_STREAM_ENFORCED_AUDIBLE" deviceCategory="DEVICE_CATEGORY_SPEAKER"
-                                                   ref="DEFAULT_SYSTEM_VOLUME_CURVE"/>
+    <volume stream="AUDIO_STREAM_ENFORCED_AUDIBLE" deviceCategory="DEVICE_CATEGORY_SPEAKER">
+        <point>1,-4500</point>
+        <point>33,-3000</point>
+        <point>66,-2000</point>
+        <point>100,-800</point>
+    </volume>
     <volume stream="AUDIO_STREAM_ENFORCED_AUDIBLE" deviceCategory="DEVICE_CATEGORY_EARPIECE"
                                                    ref="DEFAULT_SYSTEM_VOLUME_CURVE"/>
     <volume stream="AUDIO_STREAM_ENFORCED_AUDIBLE" deviceCategory="DEVICE_CATEGORY_EXT_MEDIA"
@@ -158,7 +162,7 @@ volume index from 0 to 100.
         <point>100,-1800</point>
     </volume>
     <volume stream="AUDIO_STREAM_DTMF" deviceCategory="DEVICE_CATEGORY_SPEAKER">
-        <point>1,-4200</point>
+        <point>1,-4000</point>
         <point>33,-3000</point>
         <point>66,-1800</point>
         <point>100,-600</point>
diff --git a/audio/raven/config/audio_policy_volumes.xml b/audio/raven/config/audio_policy_volumes.xml
index db57662..cd0e3a4 100644
--- a/audio/raven/config/audio_policy_volumes.xml
+++ b/audio/raven/config/audio_policy_volumes.xml
@@ -52,10 +52,10 @@ volume index from 0 to 100.
         <point>100,-1800</point>
     </volume>
     <volume stream="AUDIO_STREAM_SYSTEM" deviceCategory="DEVICE_CATEGORY_SPEAKER">
-        <point>0,-4200</point>
-        <point>33,-2800</point>
-        <point>66,-1400</point>
-        <point>100,0</point>
+        <point>1,-4700</point>
+        <point>33,-3800</point>
+        <point>66,-2800</point>
+        <point>100,-1800</point>
     </volume>
     <volume stream="AUDIO_STREAM_SYSTEM" deviceCategory="DEVICE_CATEGORY_EARPIECE"
                                          ref="DEFAULT_SYSTEM_VOLUME_CURVE"/>
@@ -143,8 +143,12 @@ volume index from 0 to 100.
         <point>66,-2200</point>
         <point>100,-1800</point>
     </volume>
-    <volume stream="AUDIO_STREAM_ENFORCED_AUDIBLE" deviceCategory="DEVICE_CATEGORY_SPEAKER"
-                                                   ref="DEFAULT_SYSTEM_VOLUME_CURVE"/>
+    <volume stream="AUDIO_STREAM_ENFORCED_AUDIBLE" deviceCategory="DEVICE_CATEGORY_SPEAKER">
+        <point>1,-4700</point>
+        <point>33,-3800</point>
+        <point>66,-2800</point>
+        <point>100,-1800</point>
+    </volume>
     <volume stream="AUDIO_STREAM_ENFORCED_AUDIBLE" deviceCategory="DEVICE_CATEGORY_EARPIECE"
                                                    ref="DEFAULT_SYSTEM_VOLUME_CURVE"/>
     <volume stream="AUDIO_STREAM_ENFORCED_AUDIBLE" deviceCategory="DEVICE_CATEGORY_EXT_MEDIA"
@@ -158,10 +162,10 @@ volume index from 0 to 100.
         <point>100,-1800</point>
     </volume>
     <volume stream="AUDIO_STREAM_DTMF" deviceCategory="DEVICE_CATEGORY_SPEAKER">
-        <point>1,-4200</point>
-        <point>33,-3000</point>
-        <point>66,-1800</point>
-        <point>100,-600</point>
+        <point>1,-5700</point>
+        <point>33,-4000</point>
+        <point>66,-3000</point>
+        <point>100,-1900</point>
     </volume>
     <volume stream="AUDIO_STREAM_DTMF" deviceCategory="DEVICE_CATEGORY_EARPIECE"
                                        ref="DEFAULT_SYSTEM_VOLUME_CURVE"/>
diff --git a/audio/raven/tuning/waves/waves_preset.mps b/audio/raven/tuning/waves/waves_preset.mps
index c244cb6..bd08ee3 100644
Binary files a/audio/raven/tuning/waves/waves_preset.mps and b/audio/raven/tuning/waves/waves_preset.mps differ