diff --git a/cfg/global_vars.mk b/cfg/global_vars.mk
index ebef4ed..bafbe48 100644
--- a/cfg/global_vars.mk
+++ b/cfg/global_vars.mk
@@ -12,9 +12,9 @@ MISC_DIR = $(BASE_DIR)/misc
 # Project files
 MANFILES = toxic.1 toxic.conf.5
 DATAFILES = DHTnodes DNSservers toxic.conf.example
-SNDFILES = ContactLogsIn.wav ContactLogsOut.wav Error.wav IncomingCall.wav
-SNDFILES += LogIn.wav LogOut.wav NewMessage.wav OutgoingCall.wav
-SNDFILES += TransferComplete.wav TransferPending.wav
+SNDFILES = ToxicContactOnline.wav ToxicContactOffline.wav ToxicError.wav
+SNDFILES += ToxicRecvMessage.wav OutgoingCall.wav IncomingCall.wav
+SNDFILES += ToxicTransferComplete.wav ToxicTransferStart.wav
 
 # Install directories
 PREFIX = /usr/local
diff --git a/misc/toxic.conf.example b/misc/toxic.conf.example
index 6dd868c..7919f5a 100644
--- a/misc/toxic.conf.example
+++ b/misc/toxic.conf.example
@@ -54,16 +54,14 @@ tox = {
 
 // To disable a sound set the path to "silent"
 sounds = {
-  error="__DATADIR__/sounds/Error.wav";
-  self_log_in="__DATADIR__/sounds/LogIn.wav";
-  self_log_out="__DATADIR__/sounds/LogOut.wav";
-  user_log_in="__DATADIR__/sounds/ContactLogsIn.wav";
-  user_log_out="__DATADIR__/sounds/ContactLogsOut.wav";
+  error="__DATADIR__/sounds/ToxicError.wav";
+  user_log_in="__DATADIR__/sounds/ToxicContactOnline.wav";
+  user_log_out="__DATADIR__/sounds/ToxicContactOffline.wav";
   call_incoming="__DATADIR__/sounds/IncomingCall.wav";
   call_outgoing="__DATADIR__/sounds/OutgoingCall.wav";
-  generic_message="__DATADIR__/sounds/NewMessage.wav";
-  transfer_pending="__DATADIR__/sounds/TransferPending.wav";
-  transfer_completed="__DATADIR__/sounds/TransferComplete.wav";
+  generic_message="__DATADIR__/sounds/ToxicRecvMessage.wav";
+  transfer_pending="__DATADIR__/sounds/ToxicTransferStart.wav";
+  transfer_completed="__DATADIR__/sounds/ToxicTransferComplete.wav";
 };
 
 // Currently supported: Ctrl modified keys, Tab, PAGEUP and PAGEDOWN (case insensitive)
diff --git a/sounds/ContactLogsIn.wav b/sounds/ContactLogsIn.wav
deleted file mode 100644
index 1defd72..0000000
Binary files a/sounds/ContactLogsIn.wav and /dev/null differ
diff --git a/sounds/ContactLogsOut.wav b/sounds/ContactLogsOut.wav
deleted file mode 100644
index 47a6706..0000000
Binary files a/sounds/ContactLogsOut.wav and /dev/null differ
diff --git a/sounds/Error.wav b/sounds/Error.wav
deleted file mode 100644
index 862da72..0000000
Binary files a/sounds/Error.wav and /dev/null differ
diff --git a/sounds/LogIn.wav b/sounds/LogIn.wav
deleted file mode 100644
index 64e6b30..0000000
Binary files a/sounds/LogIn.wav and /dev/null differ
diff --git a/sounds/LogOut.wav b/sounds/LogOut.wav
deleted file mode 100644
index 74fc16d..0000000
Binary files a/sounds/LogOut.wav and /dev/null differ
diff --git a/sounds/NewMessage.wav b/sounds/NewMessage.wav
deleted file mode 100644
index 494f4fc..0000000
Binary files a/sounds/NewMessage.wav and /dev/null differ
diff --git a/sounds/ToxicContactOffline.wav b/sounds/ToxicContactOffline.wav
new file mode 100644
index 0000000..a504cb8
Binary files /dev/null and b/sounds/ToxicContactOffline.wav differ
diff --git a/sounds/ToxicContactOnline.wav b/sounds/ToxicContactOnline.wav
new file mode 100644
index 0000000..dd185f8
Binary files /dev/null and b/sounds/ToxicContactOnline.wav differ
diff --git a/sounds/ToxicError.wav b/sounds/ToxicError.wav
new file mode 100644
index 0000000..2361038
Binary files /dev/null and b/sounds/ToxicError.wav differ
diff --git a/sounds/ToxicRecvMessage.wav b/sounds/ToxicRecvMessage.wav
new file mode 100644
index 0000000..35eba74
Binary files /dev/null and b/sounds/ToxicRecvMessage.wav differ
diff --git a/sounds/ToxicTransferComplete.wav b/sounds/ToxicTransferComplete.wav
new file mode 100644
index 0000000..dc53549
Binary files /dev/null and b/sounds/ToxicTransferComplete.wav differ
diff --git a/sounds/ToxicTransferStart.wav b/sounds/ToxicTransferStart.wav
new file mode 100644
index 0000000..f8c0d91
Binary files /dev/null and b/sounds/ToxicTransferStart.wav differ
diff --git a/sounds/TransferComplete.wav b/sounds/TransferComplete.wav
deleted file mode 100644
index ae06d8f..0000000
Binary files a/sounds/TransferComplete.wav and /dev/null differ
diff --git a/sounds/TransferPending.wav b/sounds/TransferPending.wav
deleted file mode 100644
index bddbe82..0000000
Binary files a/sounds/TransferPending.wav and /dev/null differ
diff --git a/sounds/license b/sounds/license
index 530d3d7..eddc1a9 100644
--- a/sounds/license
+++ b/sounds/license
@@ -1 +1,3 @@
-Tox's sounds are licensed under the "Creative Commons Attribution 3.0 Unported", all credit attributed to Adam Reid.
+ToxicContactOffline.wav, ToxicRecvMessage.wav, ToxicContactOnline.wav, ToxicTransferComplete.wav, ToxicError.wav and ToxicTransferStart.wav are licensed under the same license as Toxic.
+
+IncomingCall.wav and OutgoingCall.wav are licensed under the "Creative Commons Attribution 3.0 Unported", all credit attributed to Adam Reid.
diff --git a/src/settings.c b/src/settings.c
index dde7268..15f4085 100644
--- a/src/settings.c
+++ b/src/settings.c
@@ -324,33 +324,21 @@ int settings_load(struct user_settings *s, const char *patharg)
         if ( (config_setting_lookup_string(setting, sound_strings.error, &str) != CONFIG_TRUE) ||
                 !set_sound(error, str) ) {
             if (str && strcasecmp(str, NO_SOUND) != 0)
-                set_sound(error, PACKAGE_DATADIR "/sounds/Error.wav");
+                set_sound(error, PACKAGE_DATADIR "/sounds/ToxicError.wav");
         }
         
         if ( !config_setting_lookup_string(setting, sound_strings.user_log_in, &str) ||
                 !set_sound(user_log_in, str) ) {
             if (str && strcasecmp(str, NO_SOUND) != 0)
-                set_sound(user_log_in, PACKAGE_DATADIR "/sounds/ContactLogsIn.wav");
-        }
-        
-        if ( !config_setting_lookup_string(setting, sound_strings.self_log_in, &str) ||
-                !set_sound(self_log_in, str) ) {
-            if (str && strcasecmp(str, NO_SOUND) != 0)
-                set_sound(self_log_in, PACKAGE_DATADIR "/sounds/LogIn.wav");
+                set_sound(user_log_in, PACKAGE_DATADIR "/sounds/ToxicContactOnline.wav");
         }
 
         if ( !config_setting_lookup_string(setting, sound_strings.user_log_out, &str) ||
                 !set_sound(user_log_out, str) ) {
             if (str && strcasecmp(str, NO_SOUND) != 0)
-                set_sound(user_log_out, PACKAGE_DATADIR "/sounds/ContactLogsOut.wav");
+                set_sound(user_log_out, PACKAGE_DATADIR "/sounds/ToxicContactOffline.wav");
         }
 
-        if ( !config_setting_lookup_string(setting, sound_strings.self_log_out, &str) ||
-                !set_sound(self_log_out, str) ) {
-            if (str && strcasecmp(str, NO_SOUND) != 0)
-                set_sound(self_log_out, PACKAGE_DATADIR "/sounds/LogOut.wav");
-        }
-        
         if ( !config_setting_lookup_string(setting, sound_strings.call_incoming, &str) ||
                 !set_sound(call_incoming, str) ) {
             if (str && strcasecmp(str, NO_SOUND) != 0)
@@ -366,32 +354,30 @@ int settings_load(struct user_settings *s, const char *patharg)
         if ( !config_setting_lookup_string(setting, sound_strings.generic_message, &str) ||
                 !set_sound(generic_message, str) ) {
             if (str && strcasecmp(str, NO_SOUND) != 0)
-                set_sound(generic_message, PACKAGE_DATADIR "/sounds/NewMessage.wav");
+                set_sound(generic_message, PACKAGE_DATADIR "/sounds/ToxicRecvMessage.wav");
         }
         
         if ( !config_setting_lookup_string(setting, sound_strings.transfer_pending, &str) ||
                 !set_sound(transfer_pending, str) ) {
             if (str && strcasecmp(str, NO_SOUND) != 0)
-                set_sound(transfer_pending, PACKAGE_DATADIR "/sounds/TransferPending.wav");
+                set_sound(transfer_pending, PACKAGE_DATADIR "/sounds/ToxicTransferStart.wav");
         }
         
         if ( !config_setting_lookup_string(setting, sound_strings.transfer_completed, &str) ||
                 !set_sound(transfer_completed, str) ) {
             if (str && strcasecmp(str, NO_SOUND) != 0)
-                set_sound(transfer_completed, PACKAGE_DATADIR "/sounds/TransferComplete.wav");
+                set_sound(transfer_completed, PACKAGE_DATADIR "/sounds/ToxicTransferComplete.wav");
         }
     }
     else {
-        set_sound(error, PACKAGE_DATADIR "/sounds/Error.wav");
-        set_sound(user_log_in, PACKAGE_DATADIR "/sounds/ContactLogsIn.wav");
-        set_sound(self_log_in, PACKAGE_DATADIR "/sounds/LogIn.wav");
-        set_sound(user_log_out, PACKAGE_DATADIR "/sounds/ContactLogsOut.wav");
-        set_sound(self_log_out, PACKAGE_DATADIR "/sounds/LogOut.wav");
+        set_sound(error, PACKAGE_DATADIR "/sounds/ToxicError.wav");
+        set_sound(user_log_in, PACKAGE_DATADIR "/sounds/ToxicContactOnline.wav");
+        set_sound(user_log_out, PACKAGE_DATADIR "/sounds/ToxicContactOffline.wav");
         set_sound(call_incoming, PACKAGE_DATADIR "/sounds/IncomingCall.wav");
         set_sound(call_outgoing, PACKAGE_DATADIR "/sounds/OutgoingCall.wav");
-        set_sound(generic_message, PACKAGE_DATADIR "/sounds/NewMessage.wav");
-        set_sound(transfer_pending, PACKAGE_DATADIR "/sounds/TransferPending.wav");
-        set_sound(transfer_completed, PACKAGE_DATADIR "/sounds/TransferComplete.wav");
+        set_sound(generic_message, PACKAGE_DATADIR "/sounds/ToxicRecvMessage.wav");
+        set_sound(transfer_pending, PACKAGE_DATADIR "/sounds/ToxicTransferStart.wav");
+        set_sound(transfer_completed, PACKAGE_DATADIR "/sounds/ToxicTransferComplete.wav");
     }
 #endif