diff --git a/osu.Game.Resources/Samples/Menu/button-back-select.wav b/osu.Game.Resources/Samples/Menu/button-back-select.wav
index c4079e9..d7de6cf 100644
Binary files a/osu.Game.Resources/Samples/Menu/button-back-select.wav and b/osu.Game.Resources/Samples/Menu/button-back-select.wav differ
diff --git a/osu.Game.Resources/Samples/Menu/button-edit-select.wav b/osu.Game.Resources/Samples/Menu/button-edit-select.wav
new file mode 100644
index 0000000..bf17c1e
Binary files /dev/null and b/osu.Game.Resources/Samples/Menu/button-edit-select.wav differ
diff --git a/osu.Game.Resources/Samples/Menu/button-hover.wav b/osu.Game.Resources/Samples/Menu/button-hover.wav
index 68e342b..7e045dc 100644
Binary files a/osu.Game.Resources/Samples/Menu/button-hover.wav and b/osu.Game.Resources/Samples/Menu/button-hover.wav differ
diff --git a/osu.Game.Resources/Samples/Menu/button-play-select.wav b/osu.Game.Resources/Samples/Menu/button-play-select.wav
index b18bf63..778d082 100644
Binary files a/osu.Game.Resources/Samples/Menu/button-play-select.wav and b/osu.Game.Resources/Samples/Menu/button-play-select.wav differ
diff --git a/osu.Game.Resources/Samples/Menu/button-solo-select.wav b/osu.Game.Resources/Samples/Menu/button-solo-select.wav
index 99ce2bb..753a312 100644
Binary files a/osu.Game.Resources/Samples/Menu/button-solo-select.wav and b/osu.Game.Resources/Samples/Menu/button-solo-select.wav differ
diff --git a/osu.Game.Resources/Samples/Menu/osu-logo-heartbeat-1.wav b/osu.Game.Resources/Samples/Menu/osu-logo-heartbeat-1.wav
new file mode 100644
index 0000000..c0d9de9
Binary files /dev/null and b/osu.Game.Resources/Samples/Menu/osu-logo-heartbeat-1.wav differ
diff --git a/osu.Game.Resources/Samples/Menu/osu-logo-heartbeat.wav b/osu.Game.Resources/Samples/Menu/osu-logo-heartbeat.wav
index c8d6d18..b903801 100644
Binary files a/osu.Game.Resources/Samples/Menu/osu-logo-heartbeat.wav and b/osu.Game.Resources/Samples/Menu/osu-logo-heartbeat.wav differ
diff --git a/osu.Game.Resources/Samples/Menu/osu-logo-select.wav b/osu.Game.Resources/Samples/Menu/osu-logo-select.wav
index 3be3469..a707ddb 100644
Binary files a/osu.Game.Resources/Samples/Menu/osu-logo-select.wav and b/osu.Game.Resources/Samples/Menu/osu-logo-select.wav differ
diff --git a/osu.Game.Resources/Samples/SongSelect/confirm-selection.wav b/osu.Game.Resources/Samples/SongSelect/confirm-selection.wav
index faa6edf..a050598 100644
Binary files a/osu.Game.Resources/Samples/SongSelect/confirm-selection.wav and b/osu.Game.Resources/Samples/SongSelect/confirm-selection.wav differ
diff --git a/osu.Game.Resources/Samples/SongSelect/select-expand.mp3 b/osu.Game.Resources/Samples/SongSelect/select-expand.mp3
deleted file mode 100644
index 9ff9b16..0000000
Binary files a/osu.Game.Resources/Samples/SongSelect/select-expand.mp3 and /dev/null differ
diff --git a/osu.Game.Resources/Samples/SongSelect/select-expand.wav b/osu.Game.Resources/Samples/SongSelect/select-expand.wav
new file mode 100644
index 0000000..c4dc266
Binary files /dev/null and b/osu.Game.Resources/Samples/SongSelect/select-expand.wav differ
diff --git a/osu.Game.Resources/Samples/SongSelect/song-ping-variation-1.wav b/osu.Game.Resources/Samples/SongSelect/song-ping-variation-1.wav
deleted file mode 100644
index b917c5f..0000000
Binary files a/osu.Game.Resources/Samples/SongSelect/song-ping-variation-1.wav and /dev/null differ
diff --git a/osu.Game.Resources/Samples/SongSelect/song-ping-variation-2.wav b/osu.Game.Resources/Samples/SongSelect/song-ping-variation-2.wav
deleted file mode 100644
index 5548ac3..0000000
Binary files a/osu.Game.Resources/Samples/SongSelect/song-ping-variation-2.wav and /dev/null differ
diff --git a/osu.Game.Resources/Samples/SongSelect/song-ping-variation-3.wav b/osu.Game.Resources/Samples/SongSelect/song-ping-variation-3.wav
deleted file mode 100644
index 945850c..0000000
Binary files a/osu.Game.Resources/Samples/SongSelect/song-ping-variation-3.wav and /dev/null differ
diff --git a/osu.Game.Resources/Samples/SongSelect/song-ping-variation-4.wav b/osu.Game.Resources/Samples/SongSelect/song-ping-variation-4.wav
deleted file mode 100644
index 8d6e4e6..0000000
Binary files a/osu.Game.Resources/Samples/SongSelect/song-ping-variation-4.wav and /dev/null differ
diff --git a/osu.Game.Resources/Samples/SongSelect/song-ping.wav b/osu.Game.Resources/Samples/SongSelect/song-ping.wav
new file mode 100644
index 0000000..9c782cb
Binary files /dev/null and b/osu.Game.Resources/Samples/SongSelect/song-ping.wav differ
diff --git a/osu.Game.Resources/Samples/UI/check-off.wav b/osu.Game.Resources/Samples/UI/check-off.wav
index 5ea1f5b..9a8720b 100644
Binary files a/osu.Game.Resources/Samples/UI/check-off.wav and b/osu.Game.Resources/Samples/UI/check-off.wav differ
diff --git a/osu.Game.Resources/Samples/UI/check-on.wav b/osu.Game.Resources/Samples/UI/check-on.wav
index b9534a8..85bbe20 100644
Binary files a/osu.Game.Resources/Samples/UI/check-on.wav and b/osu.Game.Resources/Samples/UI/check-on.wav differ
diff --git a/osu.Game.Resources/Samples/UI/dialog-pop-in.wav b/osu.Game.Resources/Samples/UI/dialog-pop-in.wav
new file mode 100644
index 0000000..d0dd6aa
Binary files /dev/null and b/osu.Game.Resources/Samples/UI/dialog-pop-in.wav differ
diff --git a/osu.Game.Resources/Samples/UI/dialog-pop-out.wav b/osu.Game.Resources/Samples/UI/dialog-pop-out.wav
new file mode 100644
index 0000000..64b3ede
Binary files /dev/null and b/osu.Game.Resources/Samples/UI/dialog-pop-out.wav differ
diff --git a/osu.Game.Resources/Samples/UI/error-notification-pop-in.wav b/osu.Game.Resources/Samples/UI/error-notification-pop-in.wav
new file mode 100644
index 0000000..c993f85
Binary files /dev/null and b/osu.Game.Resources/Samples/UI/error-notification-pop-in.wav differ
diff --git a/osu.Game.Resources/Samples/UI/generic-hover-noclick.wav b/osu.Game.Resources/Samples/UI/generic-hover-noclick.wav
new file mode 100644
index 0000000..120ef96
Binary files /dev/null and b/osu.Game.Resources/Samples/UI/generic-hover-noclick.wav differ
diff --git a/osu.Game.Resources/Samples/UI/generic-hover-soft.wav b/osu.Game.Resources/Samples/UI/generic-hover-soft.wav
index 4598c2f..120ef96 100644
Binary files a/osu.Game.Resources/Samples/UI/generic-hover-soft.wav and b/osu.Game.Resources/Samples/UI/generic-hover-soft.wav differ
diff --git a/osu.Game.Resources/Samples/UI/generic-hover-toolbar.wav b/osu.Game.Resources/Samples/UI/generic-hover-toolbar.wav
new file mode 100644
index 0000000..5284f53
Binary files /dev/null and b/osu.Game.Resources/Samples/UI/generic-hover-toolbar.wav differ
diff --git a/osu.Game.Resources/Samples/UI/generic-hover.wav b/osu.Game.Resources/Samples/UI/generic-hover.wav
index 98fbb38..2b301c3 100644
Binary files a/osu.Game.Resources/Samples/UI/generic-hover.wav and b/osu.Game.Resources/Samples/UI/generic-hover.wav differ
diff --git a/osu.Game.Resources/Samples/UI/generic-select-noclick.wav b/osu.Game.Resources/Samples/UI/generic-select-noclick.wav
new file mode 100644
index 0000000..878bf23
Binary files /dev/null and b/osu.Game.Resources/Samples/UI/generic-select-noclick.wav differ
diff --git a/osu.Game.Resources/Samples/UI/generic-select-soft.wav b/osu.Game.Resources/Samples/UI/generic-select-soft.wav
index ea0d07e..0d45032 100644
Binary files a/osu.Game.Resources/Samples/UI/generic-select-soft.wav and b/osu.Game.Resources/Samples/UI/generic-select-soft.wav differ
diff --git a/osu.Game.Resources/Samples/UI/generic-select-toolbar.wav b/osu.Game.Resources/Samples/UI/generic-select-toolbar.wav
new file mode 100644
index 0000000..ba9c8e9
Binary files /dev/null and b/osu.Game.Resources/Samples/UI/generic-select-toolbar.wav differ
diff --git a/osu.Game.Resources/Samples/UI/generic-select.wav b/osu.Game.Resources/Samples/UI/generic-select.wav
index 36138da..d9cee23 100644
Binary files a/osu.Game.Resources/Samples/UI/generic-select.wav and b/osu.Game.Resources/Samples/UI/generic-select.wav differ
diff --git a/osu.Game.Resources/Samples/UI/notification-pop-in.wav b/osu.Game.Resources/Samples/UI/notification-pop-in.wav
new file mode 100644
index 0000000..cfc6d10
Binary files /dev/null and b/osu.Game.Resources/Samples/UI/notification-pop-in.wav differ
diff --git a/osu.Game.Resources/Samples/UI/now-playing-pop-in.wav b/osu.Game.Resources/Samples/UI/now-playing-pop-in.wav
new file mode 100644
index 0000000..3b74d6a
Binary files /dev/null and b/osu.Game.Resources/Samples/UI/now-playing-pop-in.wav differ
diff --git a/osu.Game.Resources/Samples/UI/now-playing-pop-out.wav b/osu.Game.Resources/Samples/UI/now-playing-pop-out.wav
new file mode 100644
index 0000000..c421735
Binary files /dev/null and b/osu.Game.Resources/Samples/UI/now-playing-pop-out.wav differ
diff --git a/osu.Game.Resources/Samples/UI/osd-change.wav b/osu.Game.Resources/Samples/UI/osd-change.wav
new file mode 100644
index 0000000..68afec2
Binary files /dev/null and b/osu.Game.Resources/Samples/UI/osd-change.wav differ
diff --git a/osu.Game.Resources/Samples/UI/osd-off.wav b/osu.Game.Resources/Samples/UI/osd-off.wav
new file mode 100644
index 0000000..833e8bc
Binary files /dev/null and b/osu.Game.Resources/Samples/UI/osd-off.wav differ
diff --git a/osu.Game.Resources/Samples/UI/osd-on.wav b/osu.Game.Resources/Samples/UI/osd-on.wav
new file mode 100644
index 0000000..97fa48e
Binary files /dev/null and b/osu.Game.Resources/Samples/UI/osd-on.wav differ
diff --git a/osu.Game.Resources/Samples/UI/overlay-pop-in.wav b/osu.Game.Resources/Samples/UI/overlay-pop-in.wav
index 955dcdd..0543445 100644
Binary files a/osu.Game.Resources/Samples/UI/overlay-pop-in.wav and b/osu.Game.Resources/Samples/UI/overlay-pop-in.wav differ
diff --git a/osu.Game.Resources/Samples/UI/overlay-pop-out.wav b/osu.Game.Resources/Samples/UI/overlay-pop-out.wav
index 12ef4e3..3c5db38 100644
Binary files a/osu.Game.Resources/Samples/UI/overlay-pop-out.wav and b/osu.Game.Resources/Samples/UI/overlay-pop-out.wav differ
diff --git a/osu.Game.Resources/Samples/UI/screen-back.wav b/osu.Game.Resources/Samples/UI/screen-back.wav
index acb2ee8..06ebd0e 100644
Binary files a/osu.Game.Resources/Samples/UI/screen-back.wav and b/osu.Game.Resources/Samples/UI/screen-back.wav differ
diff --git a/osu.Game.Resources/Samples/UI/settings-pop-in.wav b/osu.Game.Resources/Samples/UI/settings-pop-in.wav
new file mode 100644
index 0000000..10814ca
Binary files /dev/null and b/osu.Game.Resources/Samples/UI/settings-pop-in.wav differ
diff --git a/osu.Game.Resources/Samples/UI/sliderbar-notch.wav b/osu.Game.Resources/Samples/UI/sliderbar-notch.wav
index 2638b2c..d3aa03b 100644
Binary files a/osu.Game.Resources/Samples/UI/sliderbar-notch.wav and b/osu.Game.Resources/Samples/UI/sliderbar-notch.wav differ
diff --git a/osu.Game.Resources/Samples/UI/wave-pop-in.wav b/osu.Game.Resources/Samples/UI/wave-pop-in.wav
new file mode 100644
index 0000000..5f44f3e
Binary files /dev/null and b/osu.Game.Resources/Samples/UI/wave-pop-in.wav differ