diff --git a/src/frontends/qt4/ui/ListingsUi.ui b/src/frontends/qt4/ui/ListingsUi.ui
index acf792589c..126ba7a75c 100644
--- a/src/frontends/qt4/ui/ListingsUi.ui
+++ b/src/frontends/qt4/ui/ListingsUi.ui
@@ -1,40 +1,20 @@
 <ui version="4.0" >
  <class>ListingsUi</class>
  <widget class="QDialog" name="ListingsUi" >
-  <property name="windowModality" >
-   <enum>Qt::NonModal</enum>
-  </property>
   <property name="geometry" >
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>654</width>
+    <width>578</width>
     <height>349</height>
    </rect>
   </property>
   <property name="windowTitle" >
    <string>Listing</string>
   </property>
-  <property name="sizeGripEnabled" >
-   <bool>true</bool>
-  </property>
-  <layout class="QGridLayout" >
-   <property name="margin" >
-    <number>9</number>
-   </property>
-   <property name="spacing" >
-    <number>6</number>
-   </property>
+  <layout class="QGridLayout" name="gridLayout_9" >
    <item row="0" column="0" >
     <widget class="QTabWidget" name="listingsTW" >
-     <property name="sizePolicy" >
-      <sizepolicy>
-       <hsizetype>0</hsizetype>
-       <vsizetype>0</vsizetype>
-       <horstretch>0</horstretch>
-       <verstretch>0</verstretch>
-      </sizepolicy>
-     </property>
      <property name="currentIndex" >
       <number>0</number>
      </property>
@@ -42,29 +22,20 @@
       <attribute name="title" >
        <string>&amp;Main Settings</string>
       </attribute>
-      <layout class="QGridLayout" >
-       <property name="margin" >
-        <number>9</number>
-       </property>
-       <property name="spacing" >
-        <number>6</number>
-       </property>
+      <layout class="QGridLayout" name="gridLayout_6" >
        <item row="0" column="0" >
         <widget class="QGroupBox" name="placementGB" >
          <property name="title" >
           <string>Placement</string>
          </property>
-         <layout class="QGridLayout" >
-          <property name="margin" >
-           <number>9</number>
-          </property>
-          <property name="spacing" >
-           <number>6</number>
-          </property>
-          <item row="2" column="1" >
-           <widget class="QLineEdit" name="placementLE" >
+         <layout class="QGridLayout" name="gridLayout" >
+          <item row="0" column="0" colspan="2" >
+           <widget class="QCheckBox" name="inlineCB" >
             <property name="toolTip" >
-             <string>Specify placement (htbp) for floating listings</string>
+             <string>Check for inline listings</string>
+            </property>
+            <property name="text" >
+             <string>&amp;Inline listing</string>
             </property>
            </widget>
           </item>
@@ -78,16 +49,6 @@
             </property>
            </widget>
           </item>
-          <item row="0" column="0" colspan="2" >
-           <widget class="QCheckBox" name="inlineCB" >
-            <property name="toolTip" >
-             <string>Check for inline listings</string>
-            </property>
-            <property name="text" >
-             <string>&amp;Inline listing</string>
-            </property>
-           </widget>
-          </item>
           <item row="2" column="0" >
            <widget class="QLabel" name="captionL_5" >
             <property name="text" >
@@ -101,6 +62,13 @@
             </property>
            </widget>
           </item>
+          <item row="2" column="1" >
+           <widget class="QLineEdit" name="placementLE" >
+            <property name="toolTip" >
+             <string>Specify placement (htbp) for floating listings</string>
+            </property>
+           </widget>
+          </item>
          </layout>
         </widget>
        </item>
@@ -109,13 +77,17 @@
          <property name="title" >
           <string>Line numbering</string>
          </property>
-         <layout class="QGridLayout" >
-          <property name="margin" >
-           <number>9</number>
-          </property>
-          <property name="spacing" >
-           <number>6</number>
-          </property>
+         <layout class="QGridLayout" name="gridLayout_2" >
+          <item row="0" column="0" >
+           <widget class="QLabel" name="label" >
+            <property name="text" >
+             <string>&amp;Side:</string>
+            </property>
+            <property name="buddy" >
+             <cstring>numberSideCO</cstring>
+            </property>
+           </widget>
+          </item>
           <item row="0" column="1" >
            <widget class="QComboBox" name="numberSideCO" >
             <property name="toolTip" >
@@ -138,43 +110,6 @@
             </item>
            </widget>
           </item>
-          <item row="2" column="1" >
-           <widget class="QComboBox" name="numberFontSizeCO" >
-            <property name="sizePolicy" >
-             <sizepolicy>
-              <hsizetype>0</hsizetype>
-              <vsizetype>0</vsizetype>
-              <horstretch>0</horstretch>
-              <verstretch>0</verstretch>
-             </sizepolicy>
-            </property>
-            <property name="toolTip" >
-             <string>Choose the font size for line numbers</string>
-            </property>
-            <property name="editable" >
-             <bool>false</bool>
-            </property>
-            <property name="autoCompletion" >
-             <bool>true</bool>
-            </property>
-            <property name="duplicatesEnabled" >
-             <bool>false</bool>
-            </property>
-           </widget>
-          </item>
-          <item row="2" column="0" >
-           <widget class="QLabel" name="numberfontsizeL" >
-            <property name="text" >
-             <string>Font si&amp;ze:</string>
-            </property>
-            <property name="wordWrap" >
-             <bool>false</bool>
-            </property>
-            <property name="buddy" >
-             <cstring>numberFontSizeCO</cstring>
-            </property>
-           </widget>
-          </item>
           <item row="1" column="0" >
            <widget class="QLabel" name="stepnumberL" >
             <property name="toolTip" >
@@ -207,129 +142,38 @@
             </property>
            </widget>
           </item>
-          <item row="0" column="0" >
-           <widget class="QLabel" name="label" >
+          <item row="2" column="0" >
+           <widget class="QLabel" name="numberfontsizeL" >
             <property name="text" >
-             <string>&amp;Side:</string>
-            </property>
-            <property name="buddy" >
-             <cstring>numberSideCO</cstring>
-            </property>
-           </widget>
-          </item>
-         </layout>
-        </widget>
-       </item>
-       <item row="1" column="0" >
-        <widget class="QGroupBox" name="languageGB" >
-         <property name="title" >
-          <string>Language</string>
-         </property>
-         <layout class="QGridLayout" >
-          <property name="margin" >
-           <number>9</number>
-          </property>
-          <property name="spacing" >
-           <number>6</number>
-          </property>
-          <item row="1" column="1" >
-           <widget class="QComboBox" name="dialectCO" >
-            <property name="toolTip" >
-             <string>Select the dialect of the programming language, if available</string>
-            </property>
-           </widget>
-          </item>
-          <item row="1" column="0" >
-           <widget class="QLabel" name="dialectLBL" >
-            <property name="text" >
-             <string>&amp;Dialect:</string>
-            </property>
-            <property name="buddy" >
-             <cstring>dialectCO</cstring>
-            </property>
-           </widget>
-          </item>
-          <item row="0" column="0" >
-           <widget class="QLabel" name="languageLBL" >
-            <property name="text" >
-             <string>Lan&amp;guage:</string>
-            </property>
-            <property name="buddy" >
-             <cstring>languageCO</cstring>
-            </property>
-           </widget>
-          </item>
-          <item row="0" column="1" >
-           <widget class="QComboBox" name="languageCO" >
-            <property name="toolTip" >
-             <string>Select the programming language</string>
-            </property>
-           </widget>
-          </item>
-         </layout>
-        </widget>
-       </item>
-       <item row="1" column="1" >
-        <widget class="QGroupBox" name="rangeGB" >
-         <property name="title" >
-          <string>Range</string>
-         </property>
-         <layout class="QGridLayout" >
-          <property name="margin" >
-           <number>9</number>
-          </property>
-          <property name="spacing" >
-           <number>6</number>
-          </property>
-          <item row="1" column="0" >
-           <widget class="QLabel" name="numberfontsizeL_2" >
-            <property name="text" >
-             <string>&amp;Last line:</string>
+             <string>Font si&amp;ze:</string>
             </property>
             <property name="wordWrap" >
              <bool>false</bool>
             </property>
             <property name="buddy" >
-             <cstring>lastlineLE</cstring>
+             <cstring>numberFontSizeCO</cstring>
             </property>
            </widget>
           </item>
-          <item row="1" column="1" >
-           <widget class="QLineEdit" name="lastlineLE" >
+          <item row="2" column="1" >
+           <widget class="QComboBox" name="numberFontSizeCO" >
+            <property name="sizePolicy" >
+             <sizepolicy vsizetype="Fixed" hsizetype="Fixed" >
+              <horstretch>0</horstretch>
+              <verstretch>0</verstretch>
+             </sizepolicy>
+            </property>
             <property name="toolTip" >
-             <string>The last line to be printed</string>
+             <string>Choose the font size for line numbers</string>
             </property>
-            <property name="text" >
-             <string/>
-            </property>
-            <property name="alignment" >
-             <set>Qt::AlignLeading</set>
-            </property>
-           </widget>
-          </item>
-          <item row="0" column="1" >
-           <widget class="QLineEdit" name="firstlineLE" >
-            <property name="toolTip" >
-             <string>The first line to be printed</string>
-            </property>
-            <property name="text" >
-             <string/>
-            </property>
-            <property name="alignment" >
-             <set>Qt::AlignLeading</set>
-            </property>
-           </widget>
-          </item>
-          <item row="0" column="0" >
-           <widget class="QLabel" name="numberfontsizeL_3" >
-            <property name="text" >
-             <string>Fi&amp;rst line:</string>
-            </property>
-            <property name="wordWrap" >
+            <property name="editable" >
              <bool>false</bool>
             </property>
-            <property name="buddy" >
-             <cstring>firstlineLE</cstring>
+            <property name="autoCompletion" >
+             <bool>true</bool>
+            </property>
+            <property name="duplicatesEnabled" >
+             <bool>false</bool>
             </property>
            </widget>
           </item>
@@ -341,16 +185,7 @@
          <property name="title" >
           <string>Style</string>
          </property>
-         <layout class="QGridLayout" >
-          <property name="margin" >
-           <number>9</number>
-          </property>
-          <property name="spacing" >
-           <number>6</number>
-          </property>
-          <property name="sizeConstraint" >
-           <enum>QLayout::SetDefaultConstraint</enum>
-          </property>
+         <layout class="QGridLayout" name="gridLayout_5" >
           <item row="0" column="0" >
            <widget class="QLabel" name="fontsize_label_3" >
             <property name="text" >
@@ -367,9 +202,7 @@
           <item row="0" column="1" >
            <widget class="QComboBox" name="fontsizeCO" >
             <property name="sizePolicy" >
-             <sizepolicy>
-              <hsizetype>0</hsizetype>
-              <vsizetype>0</vsizetype>
+             <sizepolicy vsizetype="Fixed" hsizetype="Fixed" >
               <horstretch>0</horstretch>
               <verstretch>0</verstretch>
              </sizepolicy>
@@ -404,9 +237,7 @@
           <item row="1" column="1" >
            <widget class="QComboBox" name="fontstyleCO" >
             <property name="sizePolicy" >
-             <sizepolicy>
-              <hsizetype>0</hsizetype>
-              <vsizetype>0</vsizetype>
+             <sizepolicy vsizetype="Fixed" hsizetype="Fixed" >
               <horstretch>0</horstretch>
               <verstretch>0</verstretch>
              </sizepolicy>
@@ -451,7 +282,7 @@
             </property>
            </widget>
           </item>
-          <item row="5" column="0" colspan="2" >
+          <item row="4" column="0" colspan="2" >
            <widget class="QCheckBox" name="spaceInStringCB" >
             <property name="toolTip" >
              <string>Make spaces in strings visible by a special symbol</string>
@@ -464,7 +295,7 @@
             </property>
            </widget>
           </item>
-          <item row="6" column="0" >
+          <item row="5" column="0" >
            <widget class="QLabel" name="tabsizeL" >
             <property name="text" >
              <string>Tab&amp;ulator size:</string>
@@ -474,10 +305,10 @@
             </property>
            </widget>
           </item>
-          <item row="6" column="1" >
+          <item row="5" column="1" >
            <widget class="QSpinBox" name="tabsizeSB" />
           </item>
-          <item row="7" column="0" colspan="2" >
+          <item row="6" column="0" colspan="2" >
            <widget class="QCheckBox" name="extendedcharsCB" >
             <property name="enabled" >
              <bool>true</bool>
@@ -496,25 +327,121 @@
          </layout>
         </widget>
        </item>
+       <item row="1" column="0" >
+        <widget class="QGroupBox" name="languageGB" >
+         <property name="title" >
+          <string>Language</string>
+         </property>
+         <layout class="QGridLayout" name="gridLayout_3" >
+          <item row="0" column="0" >
+           <widget class="QLabel" name="languageLBL" >
+            <property name="text" >
+             <string>Lan&amp;guage:</string>
+            </property>
+            <property name="buddy" >
+             <cstring>languageCO</cstring>
+            </property>
+           </widget>
+          </item>
+          <item row="0" column="1" >
+           <widget class="QComboBox" name="languageCO" >
+            <property name="toolTip" >
+             <string>Select the programming language</string>
+            </property>
+           </widget>
+          </item>
+          <item row="1" column="0" >
+           <widget class="QLabel" name="dialectLBL" >
+            <property name="text" >
+             <string>&amp;Dialect:</string>
+            </property>
+            <property name="buddy" >
+             <cstring>dialectCO</cstring>
+            </property>
+           </widget>
+          </item>
+          <item row="1" column="1" >
+           <widget class="QComboBox" name="dialectCO" >
+            <property name="toolTip" >
+             <string>Select the dialect of the programming language, if available</string>
+            </property>
+           </widget>
+          </item>
+         </layout>
+        </widget>
+       </item>
+       <item row="1" column="1" >
+        <widget class="QGroupBox" name="rangeGB" >
+         <property name="title" >
+          <string>Range</string>
+         </property>
+         <layout class="QGridLayout" name="gridLayout_4" >
+          <item row="0" column="0" >
+           <widget class="QLabel" name="numberfontsizeL_3" >
+            <property name="text" >
+             <string>Fi&amp;rst line:</string>
+            </property>
+            <property name="wordWrap" >
+             <bool>false</bool>
+            </property>
+            <property name="buddy" >
+             <cstring>firstlineLE</cstring>
+            </property>
+           </widget>
+          </item>
+          <item row="0" column="1" >
+           <widget class="QLineEdit" name="firstlineLE" >
+            <property name="toolTip" >
+             <string>The first line to be printed</string>
+            </property>
+            <property name="text" >
+             <string/>
+            </property>
+            <property name="alignment" >
+             <set>Qt::AlignLeading</set>
+            </property>
+           </widget>
+          </item>
+          <item row="1" column="0" >
+           <widget class="QLabel" name="numberfontsizeL_2" >
+            <property name="text" >
+             <string>&amp;Last line:</string>
+            </property>
+            <property name="wordWrap" >
+             <bool>false</bool>
+            </property>
+            <property name="buddy" >
+             <cstring>lastlineLE</cstring>
+            </property>
+           </widget>
+          </item>
+          <item row="1" column="1" >
+           <widget class="QLineEdit" name="lastlineLE" >
+            <property name="toolTip" >
+             <string>The last line to be printed</string>
+            </property>
+            <property name="text" >
+             <string/>
+            </property>
+            <property name="alignment" >
+             <set>Qt::AlignLeading</set>
+            </property>
+           </widget>
+          </item>
+         </layout>
+        </widget>
+       </item>
       </layout>
      </widget>
      <widget class="QWidget" name="tab_2" >
       <attribute name="title" >
        <string>Ad&amp;vanced</string>
       </attribute>
-      <layout class="QGridLayout" >
-       <property name="margin" >
-        <number>9</number>
-       </property>
-       <property name="spacing" >
-        <number>6</number>
-       </property>
+      <layout class="QGridLayout" name="gridLayout_8" >
        <item row="0" column="0" >
         <widget class="QGroupBox" name="listingsGB" >
          <property name="sizePolicy" >
-          <sizepolicy>
-           <hsizetype>0</hsizetype>
-           <vsizetype>0</vsizetype>
+          <sizepolicy vsizetype="Fixed" hsizetype="Fixed" >
            <horstretch>0</horstretch>
            <verstretch>0</verstretch>
           </sizepolicy>
@@ -522,23 +449,7 @@
          <property name="title" >
           <string>More Parameters</string>
          </property>
-         <layout class="QGridLayout" >
-          <property name="margin" >
-           <number>9</number>
-          </property>
-          <property name="spacing" >
-           <number>6</number>
-          </property>
-          <item row="1" column="0" >
-           <widget class="QCheckBox" name="bypassCB" >
-            <property name="toolTip" >
-             <string>Check it to enter parameters that are not recognizable by LyX</string>
-            </property>
-            <property name="text" >
-             <string>&amp;Bypass validation</string>
-            </property>
-           </widget>
-          </item>
+         <layout class="QGridLayout" name="gridLayout_7" >
           <item row="0" column="0" >
            <widget class="QSplitter" name="splitter" >
             <property name="orientation" >
@@ -569,9 +480,7 @@
             </widget>
             <widget class="QTextEdit" name="listingsED" >
              <property name="sizePolicy" >
-              <sizepolicy>
-               <hsizetype>0</hsizetype>
-               <vsizetype>0</vsizetype>
+              <sizepolicy vsizetype="Fixed" hsizetype="Fixed" >
                <horstretch>0</horstretch>
                <verstretch>0</verstretch>
               </sizepolicy>
@@ -582,6 +491,16 @@
             </widget>
            </widget>
           </item>
+          <item row="1" column="0" >
+           <widget class="QCheckBox" name="bypassCB" >
+            <property name="toolTip" >
+             <string>Check it to enter parameters that are not recognizable by LyX</string>
+            </property>
+            <property name="text" >
+             <string>&amp;Bypass validation</string>
+            </property>
+           </widget>
+          </item>
          </layout>
         </widget>
        </item>
@@ -590,25 +509,16 @@
     </widget>
    </item>
    <item row="1" column="0" >
-    <layout class="QHBoxLayout" >
-     <property name="margin" >
-      <number>0</number>
-     </property>
-     <property name="spacing" >
-      <number>6</number>
-     </property>
+    <layout class="QHBoxLayout" name="horizontalLayout" >
      <item>
-      <spacer>
+      <spacer name="horizontalSpacer" >
        <property name="orientation" >
         <enum>Qt::Horizontal</enum>
        </property>
-       <property name="sizeType" >
-        <enum>QSizePolicy::Expanding</enum>
-       </property>
-       <property name="sizeHint" >
+       <property name="sizeHint" stdset="0" >
         <size>
-         <width>221</width>
-         <height>27</height>
+         <width>40</width>
+         <height>20</height>
         </size>
        </property>
       </spacer>