diff --git a/libgd b/libgd
--- a/libgd
+++ b/libgd
@@ -1 +1 @@
-Subproject commit 752f65e91ea0d9a2ee8a2d21343bbd97bd0d038a
+Subproject commit 752f65e91ea0d9a2ee8a2d21343bbd97bd0d038a-dirty
diff --git a/src/nautilus-preferences-window.c b/src/nautilus-preferences-window.c
index 8c4f981c0..2a4974336 100644
--- a/src/nautilus-preferences-window.c
+++ b/src/nautilus-preferences-window.c
@@ -62,7 +62,7 @@
 
 /* int enums */
 #define NAUTILUS_PREFERENCES_DIALOG_THUMBNAIL_LIMIT_WIDGET                     \
-    "preview_image_size_combobox"
+    "preview_image_size_spinbutton"
 
 static const char * const speed_tradeoff_values[] =
 {
@@ -367,59 +367,53 @@ static void bind_builder_bool(GtkBuilder *builder,
                      "active", G_SETTINGS_BIND_DEFAULT);
 }
 
-typedef struct
+static GVariant *spinbutton_set_mapping(const GValue       *gvalue,
+                                        const GVariantType *expected_type,
+                                        gpointer            user_data)
 {
-    const guint64 *values;
-    int n_values;
-} UIntEnumBinding;
-
-static gboolean uint_enum_get_mapping(GValue   *value,
-                                      GVariant *variant,
-                                      gpointer  user_data)
-{
-    UIntEnumBinding *binding = user_data;
-    guint64 v;
-    int i;
+    const gint32 *widget_value = user_data;
+    GVariant *retval = NULL;
 
-    v = g_variant_get_uint64 (variant);
-    for (i = 0; i < binding->n_values; i++)
+    if (g_value_get_int (gvalue))
     {
-        if (binding->values[i] >= v)
-        {
-            g_value_set_int (value, i);
-            return TRUE;
-        }
+        retval = g_variant_new_uint32 (widget_value);
     }
 
-    return FALSE;
+    return retval;
 }
 
-static GVariant *uint_enum_set_mapping(const GValue       *value,
-                                       const GVariantType *expected_type,
-                                       gpointer            user_data)
+static gboolean spinbutton_get_mapping(GValue   *gvalue,
+                                  GVariant *variant,
+                                  gpointer  user_data)
 {
-    UIntEnumBinding *binding = user_data;
+    const gint32 *widget_value = user_data;
+    const gint32 *value;
 
-    return g_variant_new_uint64 (binding->values[g_value_get_int (value)]);
+    value = g_variant_get_uint32 (variant);
+
+    if (value == widget_value)
+    {
+        g_value_set_boolean (gvalue, TRUE);
+    }
+    else
+    {
+        g_value_set_boolean (gvalue, FALSE);
+    }
+
+    return TRUE;
 }
 
-static void bind_builder_uint_enum(GtkBuilder    *builder,
+static void bind_builder_uint_spin(GtkBuilder    *builder,
                                    GSettings     *settings,
                                    const char    *widget_name,
-                                   const char    *prefs,
-                                   const guint64 *values,
-                                   int            n_values)
-{
-    UIntEnumBinding *binding;
-
-    binding = g_new (UIntEnumBinding, 1);
-    binding->values = values;
-    binding->n_values = n_values;
+                                   const char    *prefs)
+{   
+    gint32 minimum = 10;
 
     g_settings_bind_with_mapping (
         settings, prefs, gtk_builder_get_object (builder, widget_name), "active",
-        G_SETTINGS_BIND_DEFAULT, uint_enum_get_mapping, uint_enum_set_mapping,
-        binding, g_free);
+        G_SETTINGS_BIND_DEFAULT, spinbutton_get_mapping, spinbutton_set_mapping,
+        minimum, g_free);
 }
 
 static GVariant *radio_mapping_set(const GValue       *gvalue,
@@ -522,11 +516,9 @@ static void nautilus_preferences_window_setup(GtkBuilder *builder,
                         NAUTILUS_PREFERENCES_SHOW_DIRECTORY_ITEM_COUNTS,
                         (const char **) speed_tradeoff_values);
 
-    bind_builder_uint_enum (builder, nautilus_preferences,
+    bind_builder_uint_spin (builder, nautilus_preferences,
                             NAUTILUS_PREFERENCES_DIALOG_THUMBNAIL_LIMIT_WIDGET,
-                            NAUTILUS_PREFERENCES_FILE_THUMBNAIL_LIMIT,
-                            thumbnail_limit_values,
-                            G_N_ELEMENTS (thumbnail_limit_values));
+                            NAUTILUS_PREFERENCES_FILE_THUMBNAIL_LIMIT);
 
     nautilus_preferences_window_setup_icon_caption_page (builder);
     nautilus_preferences_window_setup_list_column_page (builder);
diff --git a/src/nautilus-properties-window.c b/src/nautilus-properties-window.c
index 40ad2554d..55c7ce329 100644
--- a/src/nautilus-properties-window.c
+++ b/src/nautilus-properties-window.c
@@ -1512,7 +1512,7 @@ attach_ellipsizing_value_field (NautilusPropertiesWindow *window,
                                         file_attribute_name,
                                         inconsistent_string,
                                         show_original,
-                                        TRUE);
+                                        FALSE);
 }
 
 static void
diff --git a/src/resources/ui/nautilus-preferences-window.ui b/src/resources/ui/nautilus-preferences-window.ui
index 96a2be860..7cf9fb73a 100644
--- a/src/resources/ui/nautilus-preferences-window.ui
+++ b/src/resources/ui/nautilus-preferences-window.ui
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.19.0 -->
+<!-- Generated with glade 3.20.0 -->
 <interface>
   <requires lib="gtk+" version="3.16"/>
   <object class="GtkListStore" id="icon_view_zoom_levels">
@@ -422,7 +422,7 @@ More information will appear when zooming closer.</property>
                       <object class="GtkLabel" id="label9">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="label" translatable="yes" comments="Translators: This is an ordinal number" context="the n-th position of an icon caption">Second</property>
+                        <property name="label" translatable="yes" context="the n-th position of an icon caption" comments="Translators: This is an ordinal number">Second</property>
                         <property name="xalign">1</property>
                         <style>
                           <class name="dim-label"/>
@@ -437,7 +437,7 @@ More information will appear when zooming closer.</property>
                       <object class="GtkLabel" id="label11">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="label" translatable="yes" comments="Translators: This is an ordinal number" context="the n-th position of an icon caption">Third</property>
+                        <property name="label" translatable="yes" context="the n-th position of an icon caption" comments="Translators: This is an ordinal number">Third</property>
                         <property name="xalign">1</property>
                         <style>
                           <class name="dim-label"/>
@@ -452,7 +452,7 @@ More information will appear when zooming closer.</property>
                       <object class="GtkLabel" id="label8">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="label" translatable="yes" comments="Translators: This is an ordinal number" context="the n-th position of an icon caption">First</property>
+                        <property name="label" translatable="yes" context="the n-th position of an icon caption" comments="Translators: This is an ordinal number">First</property>
                         <property name="xalign">1</property>
                         <style>
                           <class name="dim-label"/>
@@ -1082,9 +1082,8 @@ More information will appear when zooming closer.</property>
                       <object class="GtkLabel" id="preview_label_1">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="label" translatable="yes">Onl_y for files smaller than:</property>
+                        <property name="label" translatable="yes">Onl_y for files smaller than (MB) :</property>
                         <property name="use_underline">True</property>
-                        <property name="mnemonic_widget">preview_image_size_combobox</property>
                         <property name="xalign">0</property>
                       </object>
                       <packing>
@@ -1094,16 +1093,10 @@ More information will appear when zooming closer.</property>
                       </packing>
                     </child>
                     <child>
-                      <object class="GtkComboBox" id="preview_image_size_combobox">
+                      <object class="GtkSpinButton" id="file size picker">
                         <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="model">model8</property>
-                        <child>
-                          <object class="GtkCellRendererText" id="renderer8"/>
-                          <attributes>
-                            <attribute name="text">0</attribute>
-                          </attributes>
-                        </child>
+                        <property name="can_focus">True</property>
+                        <property name="text" translatable="yes">10</property>
                       </object>
                       <packing>
                         <property name="expand">False</property>
@@ -1237,5 +1230,8 @@ More information will appear when zooming closer.</property>
         </child>
       </object>
     </child>
+    <child type="titlebar">
+      <placeholder/>
+    </child>
   </object>
 </interface>
