diff --git a/src/blackgui/components/settingscomponent.cpp b/src/blackgui/components/settingscomponent.cpp
index 6d35baf5e..e6bff02e5 100644
--- a/src/blackgui/components/settingscomponent.cpp
+++ b/src/blackgui/components/settingscomponent.cpp
@@ -6,7 +6,7 @@
  * or distributed except according to the terms contained in the LICENSE file.
  */
 
-#include "blackgui/components/audiosetupcomponent.h"
+#include "blackgui/components/audionotificationcomponent.h"
 #include "blackgui/components/settingscomponent.h"
 #include "blackgui/guiapplication.h"
 #include "blackgui/stylesheetutility.h"
@@ -132,7 +132,7 @@ namespace BlackGui
 
         bool CSettingsComponent::playNotificationSounds() const
         {
-            return ui->comp_AudioSetup->playNotificationSounds();
+            return ui->comp_AudioNotification->playNotificationSounds();
         }
 
         CSpecializedSimulatorSettings CSettingsComponent::getSimulatorSettings(const CSimulatorInfo &simulator) const
diff --git a/src/blackgui/components/settingscomponent.ui b/src/blackgui/components/settingscomponent.ui
index 357e8f7c1..a9a6bb41a 100644
--- a/src/blackgui/components/settingscomponent.ui
+++ b/src/blackgui/components/settingscomponent.ui
@@ -14,7 +14,7 @@
    <string>Settings</string>
   </property>
   <property name="currentIndex">
-   <number>7</number>
+   <number>0</number>
   </property>
   <widget class="QWidget" name="tb_SettingsOverview">
    <attribute name="title">
@@ -358,7 +358,7 @@
      <number>1</number>
     </property>
     <item alignment="Qt::AlignTop">
-     <widget class="BlackGui::Components::CSettingsHotkeyComponent" name="comp_SettingsHotkeysComponent">
+     <widget class="BlackGui::Components::CSettingsHotkeyComponent" name="comp_SettingsHotkeys">
       <property name="minimumSize">
        <size>
         <width>0</width>
@@ -389,13 +389,13 @@
     <property name="bottomMargin">
      <number>1</number>
     </property>
-    <item>
-     <widget class="BlackGui::Components::CAudioSetupComponent" name="comp_AudioSetup">
-      <property name="frameShape">
-       <enum>QFrame::StyledPanel</enum>
-      </property>
-      <property name="frameShadow">
-       <enum>QFrame::Raised</enum>
+    <item alignment="Qt::AlignTop">
+     <widget class="BlackGui::Components::CAudioNotificationComponent" name="comp_AudioNotification">
+      <property name="minimumSize">
+       <size>
+        <width>0</width>
+        <height>200</height>
+       </size>
       </property>
      </widget>
     </item>
@@ -632,7 +632,7 @@
      <number>1</number>
     </property>
     <item>
-     <widget class="BlackGui::Components::CSettingsAdvancedComponent" name="comp_SettingsAdvancedComponent">
+     <widget class="BlackGui::Components::CSettingsAdvancedComponent" name="comp_SettingsAdvanced">
       <property name="frameShape">
        <enum>QFrame::StyledPanel</enum>
       </property>
@@ -663,12 +663,6 @@
    <header>blackgui/components/settingsguicomponent.h</header>
    <container>1</container>
   </customwidget>
-  <customwidget>
-   <class>BlackGui::Components::CAudioSetupComponent</class>
-   <extends>QFrame</extends>
-   <header>blackgui/components/audiosetupcomponent.h</header>
-   <container>1</container>
-  </customwidget>
   <customwidget>
    <class>BlackGui::Components::CSettingsAdvancedComponent</class>
    <extends>QFrame</extends>
@@ -717,6 +711,12 @@
    <header>blackgui/components/settingsmatchingcomponent.h</header>
    <container>1</container>
   </customwidget>
+  <customwidget>
+   <class>BlackGui::Components::CAudioNotificationComponent</class>
+   <extends>QFrame</extends>
+   <header>blackgui/components/audionotificationcomponent.h</header>
+   <container>1</container>
+  </customwidget>
  </customwidgets>
  <tabstops>
   <tabstop>pb_Servers</tabstop>