diff --git a/src/frontends/qt4/ui/PrefEditUi.ui b/src/frontends/qt4/ui/PrefEditUi.ui
index 5f6b8b3c7d..5a35554082 100644
--- a/src/frontends/qt4/ui/PrefEditUi.ui
+++ b/src/frontends/qt4/ui/PrefEditUi.ui
@@ -1,90 +1,89 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ui version="4.0">
+<ui version="4.0" >
  <class>PrefEditUi</class>
- <widget class="QWidget" name="PrefEditUi">
-  <property name="geometry">
+ <widget class="QWidget" name="PrefEditUi" >
+  <property name="geometry" >
    <rect>
     <x>0</x>
     <y>0</y>
     <width>384</width>
-    <height>361</height>
+    <height>408</height>
    </rect>
   </property>
-  <property name="sizePolicy">
-   <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
+  <property name="sizePolicy" >
+   <sizepolicy vsizetype="Fixed" hsizetype="Fixed" >
     <horstretch>0</horstretch>
     <verstretch>0</verstretch>
    </sizepolicy>
   </property>
-  <property name="windowTitle">
+  <property name="windowTitle" >
    <string/>
   </property>
-  <layout class="QVBoxLayout" name="verticalLayout">
+  <layout class="QVBoxLayout" name="verticalLayout" >
    <item>
-    <widget class="QGroupBox" name="scrollGB">
-     <property name="title">
+    <widget class="QGroupBox" name="scrollGB" >
+     <property name="title" >
       <string>Editing</string>
      </property>
-     <property name="alignment">
+     <property name="alignment" >
       <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
      </property>
-     <property name="flat">
+     <property name="flat" >
       <bool>true</bool>
      </property>
-     <layout class="QGridLayout" name="gridLayout">
-      <item row="0" column="0">
-       <widget class="QCheckBox" name="cursorFollowsCB">
-        <property name="text">
+     <layout class="QGridLayout" name="gridLayout" >
+      <item row="0" column="0" >
+       <widget class="QCheckBox" name="cursorFollowsCB" >
+        <property name="text" >
          <string>Cursor &amp;follows scrollbar</string>
         </property>
        </widget>
       </item>
-      <item row="2" column="0">
-       <widget class="QCheckBox" name="scrollBelowCB">
-        <property name="text">
+      <item row="2" column="0" >
+       <widget class="QCheckBox" name="scrollBelowCB" >
+        <property name="text" >
          <string>Scroll &amp;below end of document</string>
         </property>
        </widget>
       </item>
-      <item row="4" column="0">
-       <widget class="QCheckBox" name="sortEnvironmentsCB">
-        <property name="text">
+      <item row="4" column="0" >
+       <widget class="QCheckBox" name="sortEnvironmentsCB" >
+        <property name="text" >
          <string>Sort &amp;environments alphabetically</string>
         </property>
        </widget>
       </item>
-      <item row="5" column="0">
-       <widget class="QCheckBox" name="groupEnvironmentsCB">
-        <property name="text">
+      <item row="5" column="0" >
+       <widget class="QCheckBox" name="groupEnvironmentsCB" >
+        <property name="text" >
          <string>&amp;Group environments by their category</string>
         </property>
        </widget>
       </item>
-      <item row="6" column="0">
-       <widget class="QComboBox" name="macroEditStyleCO">
+      <item row="6" column="0" >
+       <widget class="QComboBox" name="macroEditStyleCO" >
         <item>
-         <property name="text">
+         <property name="text" >
           <string>Edit Math Macros inline with a box around</string>
          </property>
         </item>
         <item>
-         <property name="text">
+         <property name="text" >
           <string>Edit Math Macros inline with the name in the status bar</string>
          </property>
         </item>
         <item>
-         <property name="text">
+         <property name="text" >
           <string>Edit Math Macros with a parameter list (like in LyX &lt; 1.6)</string>
          </property>
         </item>
        </widget>
       </item>
-      <item row="6" column="1">
-       <spacer name="horizontalSpacer">
-        <property name="orientation">
+      <item row="6" column="1" >
+       <spacer name="horizontalSpacer" >
+        <property name="orientation" >
          <enum>Qt::Horizontal</enum>
         </property>
-        <property name="sizeHint" stdset="0">
+        <property name="sizeHint" stdset="0" >
          <size>
           <width>40</width>
           <height>20</height>
@@ -92,10 +91,13 @@
         </property>
        </spacer>
       </item>
-      <item row="3" column="0">
-       <widget class="QCheckBox" name="macLikeWordMovementCB">
-        <property name="text">
-         <string>Use Mac-style for moving between &amp;words</string>
+      <item row="3" column="0" >
+       <widget class="QCheckBox" name="macLikeWordMovementCB" >
+        <property name="toolTip" >
+         <string>Skip trailing non-word characters</string>
+        </property>
+        <property name="text" >
+         <string>Use Mac-style for cursor moving between &amp;words</string>
         </property>
        </widget>
       </item>
@@ -103,85 +105,85 @@
     </widget>
    </item>
    <item>
-    <widget class="QGroupBox" name="fullscreenGB">
-     <property name="title">
+    <widget class="QGroupBox" name="fullscreenGB" >
+     <property name="title" >
       <string>Fullscreen</string>
      </property>
-     <property name="alignment">
+     <property name="alignment" >
       <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
      </property>
-     <property name="flat">
+     <property name="flat" >
       <bool>true</bool>
      </property>
-     <layout class="QGridLayout" name="gridLayout_2">
-      <item row="0" column="0">
-       <widget class="QCheckBox" name="toggleToolbarsCB">
-        <property name="sizePolicy">
-         <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
+     <layout class="QGridLayout" name="gridLayout_2" >
+      <item row="0" column="0" >
+       <widget class="QCheckBox" name="toggleToolbarsCB" >
+        <property name="sizePolicy" >
+         <sizepolicy vsizetype="Fixed" hsizetype="Fixed" >
           <horstretch>0</horstretch>
           <verstretch>0</verstretch>
          </sizepolicy>
         </property>
-        <property name="text">
+        <property name="text" >
          <string>&amp;Hide toolbars</string>
         </property>
        </widget>
       </item>
-      <item row="1" column="0">
-       <widget class="QCheckBox" name="toggleScrollbarCB">
-        <property name="text">
+      <item row="1" column="0" >
+       <widget class="QCheckBox" name="toggleScrollbarCB" >
+        <property name="text" >
          <string>Hide scr&amp;ollbar</string>
         </property>
        </widget>
       </item>
-      <item row="2" column="0">
-       <widget class="QCheckBox" name="toggleTabbarCB">
-        <property name="text">
+      <item row="2" column="0" >
+       <widget class="QCheckBox" name="toggleTabbarCB" >
+        <property name="text" >
          <string>Hide &amp;tabbar</string>
         </property>
        </widget>
       </item>
-      <item row="3" column="0">
-       <widget class="QCheckBox" name="toggleMenubarCB">
-        <property name="text">
+      <item row="3" column="0" >
+       <widget class="QCheckBox" name="toggleMenubarCB" >
+        <property name="text" >
          <string>Hide &amp;menubar</string>
         </property>
        </widget>
       </item>
-      <item row="4" column="0">
-       <widget class="QGroupBox" name="fullscreenLimitGB">
-        <property name="title">
+      <item row="4" column="0" >
+       <widget class="QGroupBox" name="fullscreenLimitGB" >
+        <property name="title" >
          <string>&amp;Limit text width</string>
         </property>
-        <property name="flat">
+        <property name="flat" >
          <bool>true</bool>
         </property>
-        <property name="checkable">
+        <property name="checkable" >
          <bool>true</bool>
         </property>
-        <layout class="QGridLayout" name="gridLayout_3">
-         <item row="0" column="0">
-          <widget class="QLabel" name="label_2">
-           <property name="text">
+        <layout class="QGridLayout" name="gridLayout_3" >
+         <item row="0" column="0" >
+          <widget class="QLabel" name="label_2" >
+           <property name="text" >
             <string>Screen used (&amp;pixels):</string>
            </property>
-           <property name="buddy">
+           <property name="buddy" >
             <cstring>fullscreenWidthSB</cstring>
            </property>
           </widget>
          </item>
-         <item row="0" column="1">
-          <widget class="QSpinBox" name="fullscreenWidthSB">
-           <property name="minimum">
+         <item row="0" column="1" >
+          <widget class="QSpinBox" name="fullscreenWidthSB" >
+           <property name="minimum" >
             <number>0</number>
            </property>
-           <property name="maximum">
+           <property name="maximum" >
             <number>10000</number>
            </property>
-           <property name="singleStep">
+           <property name="singleStep" >
             <number>10</number>
            </property>
-           <property name="value">
+           <property name="value" >
             <number>700</number>
            </property>
           </widget>
@@ -189,12 +191,12 @@
         </layout>
        </widget>
       </item>
-      <item row="4" column="1">
-       <spacer name="horizontalSpacer_2">
-        <property name="orientation">
+      <item row="4" column="1" >
+       <spacer name="horizontalSpacer_2" >
+        <property name="orientation" >
          <enum>Qt::Horizontal</enum>
         </property>
-        <property name="sizeHint" stdset="0">
+        <property name="sizeHint" stdset="0" >
          <size>
           <width>157</width>
           <height>20</height>
@@ -207,10 +209,10 @@
    </item>
    <item>
     <spacer>
-     <property name="orientation">
+     <property name="orientation" >
       <enum>Qt::Vertical</enum>
      </property>
-     <property name="sizeHint" stdset="0">
+     <property name="sizeHint" stdset="0" >
       <size>
        <width>0</width>
        <height>0</height>
@@ -220,7 +222,7 @@
    </item>
   </layout>
  </widget>
- <layoutdefault spacing="4" margin="9"/>
+ <layoutdefault spacing="4" margin="9" />
  <tabstops>
   <tabstop>cursorFollowsCB</tabstop>
   <tabstop>scrollBelowCB</tabstop>
@@ -229,7 +231,7 @@
   <tabstop>macroEditStyleCO</tabstop>
  </tabstops>
  <includes>
-  <include location="local">qt_i18n.h</include>
+  <include location="local" >qt_i18n.h</include>
  </includes>
  <resources/>
  <connections/>