Index: /trunk/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsAudio.cpp
===================================================================
--- /trunk/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsAudio.cpp	(revision 46629)
+++ /trunk/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsAudio.cpp	(revision 46630)
@@ -195,9 +195,6 @@
 void UIMachineSettingsAudio::polishPage()
 {
-    mGbAudio->setEnabled(isMachineOffline());
-    mLbAudioDriver->setEnabled(isMachineOffline());
-    mCbAudioDriver->setEnabled(isMachineOffline());
-    mLbAudioController->setEnabled(isMachineOffline());
-    mCbAudioController->setEnabled(isMachineOffline());
-}
-
+    setEnabled(isMachineOffline());
+    mAudioChild->setEnabled(mGbAudio->isChecked());
+}
+
Index: /trunk/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsAudio.ui
===================================================================
--- /trunk/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsAudio.ui	(revision 46629)
+++ /trunk/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsAudio.ui	(revision 46630)
@@ -23,7 +23,4 @@
      <property name="text">
       <string>Enable &amp;Audio</string>
-     </property>
-     <property name="checked" >
-      <bool>true</bool>
      </property>
     </widget>
@@ -66,4 +63,10 @@
       <item row="0" column="1">
        <widget class="QComboBox" name="mCbAudioDriver">
+        <property name="sizePolicy">
+         <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
+          <horstretch>1</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
+        </property>
         <property name="whatsThis">
          <string>Controls the audio output driver. The &lt;b>Null Audio Driver&lt;/b> makes the guest see an audio card, however every access to it will be ignored.</string>
@@ -86,4 +89,10 @@
       <item row="1" column="1">
        <widget class="QComboBox" name="mCbAudioController">
+        <property name="sizePolicy">
+         <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
+          <horstretch>1</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
+        </property>
         <property name="whatsThis">
          <string>Selects the type of the virtual sound card. Depending on this value, VirtualBox will provide different audio hardware to the virtual machine.</string>
@@ -94,18 +103,5 @@
     </widget>
    </item>
-   <item row="1" column="2">
-    <spacer>
-     <property name="orientation">
-      <enum>Qt::Horizontal</enum>
-     </property>
-     <property name="sizeHint">
-      <size>
-       <width>40</width>
-       <height>20</height>
-      </size>
-     </property>
-    </spacer>
-   </item>
-   <item row="2" column="1">
+   <item row="2" column="0" colspan="2">
     <spacer>
      <property name="orientation">
@@ -129,14 +125,4 @@
    <receiver>mAudioChild</receiver>
    <slot>setEnabled(bool)</slot>
-   <hints>
-    <hint type="sourcelabel">
-     <x>111</x>
-     <y>19</y>
-    </hint>
-    <hint type="destinationlabel">
-     <x>124</x>
-     <y>61</y>
-    </hint>
-   </hints>
   </connection>
  </connections>