9d9bd1a
diff --git a/data/net.launchpad.plank.gschema.xml.in b/data/net.launchpad.plank.gschema.xml.in
9d9bd1a
index e122aec..6c2efe4 100644
9d9bd1a
--- a/data/net.launchpad.plank.gschema.xml.in
9d9bd1a
+++ b/data/net.launchpad.plank.gschema.xml.in
Wesley Hearn b9d6252
@@ -128,16 +128,5 @@
9d9bd1a
 			<summary>Dock unhide delay</summary>
9d9bd1a
 			<description>Length of the delay before unhiding the dock, in milliseconds.</description>
Wesley Hearn b9d6252
 		</key>
Wesley Hearn b9d6252
-		<key name="zoom-enabled" type="b">
Wesley Hearn b9d6252
-			<default>false</default>
9d9bd1a
-			<summary>Zoom dock items when hovered</summary>
9d9bd1a
-			<description>If true, zoom dock items when hovered with the cursor.</description>
Wesley Hearn b9d6252
-		</key>
Wesley Hearn b9d6252
-		<key name="zoom-percent" type="i">
Wesley Hearn b9d6252
-			<range min="100" max="200"/>
Wesley Hearn b9d6252
-			<default>150</default>
9d9bd1a
-			<summary>Icon zoom percentage</summary>
9d9bd1a
-			<description>The amount to zoom dock items, in percent.</description>
Wesley Hearn b9d6252
-		</key>
Wesley Hearn b9d6252
 	</schema>
Wesley Hearn b9d6252
 </schemalist>
Wesley Hearn 90669ae
diff --git a/data/ui/preferences.ui b/data/ui/preferences.ui
Wesley Hearn 90669ae
index 647c90d..a394105 100644
Wesley Hearn 90669ae
--- a/data/ui/preferences.ui
Wesley Hearn 90669ae
+++ b/data/ui/preferences.ui
Wesley Hearn 90669ae
@@ -42,13 +42,6 @@ along with plank.  If not, see <http://www.gnu.org/licenses/>.
Wesley Hearn c358ea7
     <property name="upper">2500</property>
Wesley Hearn c358ea7
     <property name="step_increment">50</property>
Wesley Hearn c358ea7
   </object>
Wesley Hearn c358ea7
-  <object class="GtkAdjustment" id="adj_zoom_percent">
Wesley Hearn c358ea7
-    <property name="lower">100</property>
Wesley Hearn c358ea7
-    <property name="upper">200</property>
Wesley Hearn c358ea7
-    <property name="value">150</property>
Wesley Hearn c358ea7
-    <property name="step_increment">5</property>
Wesley Hearn c358ea7
-    <property name="page_increment">10</property>
Wesley Hearn c358ea7
-  </object>
Wesley Hearn b9d6252
   <template class="PlankPreferencesWindow" parent="GtkWindow">
Wesley Hearn c358ea7
     <property name="can_focus">False</property>
Wesley Hearn b9d6252
     <property name="resizable">False</property>
9d9bd1a
@@ -271,45 +264,6 @@ along with plank.  If not, see <http://www.gnu.org/licenses/>.
9d9bd1a
                 <property name="width">2</property>
Wesley Hearn b9d6252
               </packing>
Wesley Hearn b9d6252
             </child>
9d9bd1a
-            <child>
Wesley Hearn b9d6252
-              <object class="GtkScale" id="s_zoom_percent">
Wesley Hearn b9d6252
-                <property name="visible">True</property>
Wesley Hearn b9d6252
-                <property name="can_focus">True</property>
Wesley Hearn b9d6252
-                <property name="adjustment">adj_zoom_percent</property>
Wesley Hearn b9d6252
-                <property name="digits">0</property>
Wesley Hearn b9d6252
-                <property name="value_pos">right</property>
Wesley Hearn b9d6252
-              </object>
Wesley Hearn b9d6252
-              <packing>
Wesley Hearn b9d6252
-                <property name="left_attach">3</property>
Wesley Hearn b9d6252
-                <property name="top_attach">6</property>
Wesley Hearn b9d6252
-              </packing>
Wesley Hearn b9d6252
-            </child>
Wesley Hearn b9d6252
-            <child>
Wesley Hearn b9d6252
-              <object class="GtkSwitch" id="sw_zoom_enabled">
Wesley Hearn b9d6252
-                <property name="visible">True</property>
Wesley Hearn b9d6252
-                <property name="can_focus">True</property>
Wesley Hearn b9d6252
-                <property name="halign">start</property>
Wesley Hearn b9d6252
-                <property name="valign">center</property>
Wesley Hearn b9d6252
-              </object>
Wesley Hearn b9d6252
-              <packing>
Wesley Hearn b9d6252
-                <property name="left_attach">2</property>
Wesley Hearn b9d6252
-                <property name="top_attach">6</property>
Wesley Hearn b9d6252
-              </packing>
Wesley Hearn b9d6252
-            </child>
Wesley Hearn b9d6252
-            <child>
Wesley Hearn b9d6252
-              <object class="GtkLabel" id="l_iconzoom">
Wesley Hearn b9d6252
-                <property name="visible">True</property>
Wesley Hearn b9d6252
-                <property name="can_focus">False</property>
Wesley Hearn b9d6252
-                <property name="halign">end</property>
Wesley Hearn b9d6252
-                <property name="label" translatable="yes">Icon Zoom:</property>
Wesley Hearn b9d6252
-                <property name="justify">right</property>
Wesley Hearn b9d6252
-              </object>
Wesley Hearn b9d6252
-              <packing>
Wesley Hearn b9d6252
-                <property name="left_attach">0</property>
Wesley Hearn b9d6252
-                <property name="top_attach">6</property>
Wesley Hearn b9d6252
-                <property name="width">2</property>
Wesley Hearn b9d6252
-              </packing>
Wesley Hearn b9d6252
-            </child>
9d9bd1a
             <child>
Wesley Hearn b9d6252
               <object class="GtkSwitch" id="sw_primary_display">
Wesley Hearn b9d6252
                 <property name="visible">True</property>
Wesley Hearn 90669ae
diff --git a/lib/DockPreferences.vala b/lib/DockPreferences.vala
9d9bd1a
index a6fec4b..07d86b4 100644
Wesley Hearn 90669ae
--- a/lib/DockPreferences.vala
Wesley Hearn 90669ae
+++ b/lib/DockPreferences.vala
9d9bd1a
@@ -82,10 +82,10 @@ namespace Plank
Wesley Hearn f99cad6
 		public bool ShowDockItem { get; set; }
Wesley Hearn f99cad6
 		
9d9bd1a
 		[Description(nick = "zoom-enabled", blurb = "Whether the dock will zoom when hovered.")]
Wesley Hearn f99cad6
-		public bool ZoomEnabled { get; set; }
Wesley Hearn f99cad6
+		public bool ZoomEnabled { get { return false; } }
9d9bd1a
 		
Wesley Hearn 90669ae
 		[Description(nick = "zoom-percent", blurb = "The dock's icon-zoom (in percent).")]
Wesley Hearn 90669ae
-		public uint ZoomPercent { get; set; }
Wesley Hearn 90669ae
+		public uint ZoomPercent { get { return 100; } }
9d9bd1a
 		
Wesley Hearn f99cad6
 		[Description(nick = "tooltips-enabled", blurb = "Whether to show tooltips when items are hovered.")]
Wesley Hearn 90669ae
 		public bool TooltipsEnabled { get; set; }
Wesley Hearn 90669ae
diff --git a/lib/Widgets/PreferencesWindow.vala b/lib/Widgets/PreferencesWindow.vala
9d9bd1a
index e9444e1..0c34a97 100644
Wesley Hearn 90669ae
--- a/lib/Widgets/PreferencesWindow.vala
Wesley Hearn 90669ae
+++ b/lib/Widgets/PreferencesWindow.vala
9d9bd1a
@@ -48,8 +48,6 @@ namespace Plank
Wesley Hearn c358ea7
 		Gtk.SpinButton sp_unhide_delay;
Wesley Hearn b9d6252
 		[GtkChild]
Wesley Hearn c358ea7
 		Gtk.Scale s_offset;
Wesley Hearn b9d6252
-		[GtkChild]
Wesley Hearn c358ea7
-		Gtk.Scale s_zoom_percent;
9d9bd1a
 		
Wesley Hearn b9d6252
 		[GtkChild]
Wesley Hearn c358ea7
 		Gtk.Adjustment adj_hide_delay;
9d9bd1a
@@ -59,8 +57,6 @@ namespace Plank
Wesley Hearn c358ea7
 		Gtk.Adjustment adj_iconsize;
Wesley Hearn b9d6252
 		[GtkChild]
Wesley Hearn c358ea7
 		Gtk.Adjustment adj_offset;
Wesley Hearn b9d6252
-		[GtkChild]
Wesley Hearn c358ea7
-		Gtk.Adjustment adj_zoom_percent;
9d9bd1a
 		
Wesley Hearn b9d6252
 		[GtkChild]
Wesley Hearn c358ea7
 		Gtk.Switch sw_hide;
9d9bd1a
@@ -74,8 +70,6 @@ namespace Plank
Wesley Hearn b9d6252
 		Gtk.Switch sw_lock_items;
Wesley Hearn b9d6252
 		[GtkChild]
Wesley Hearn c358ea7
 		Gtk.Switch sw_pressure_reveal;
Wesley Hearn b9d6252
-		[GtkChild]
Wesley Hearn c358ea7
-		Gtk.Switch sw_zoom_enabled;
9d9bd1a
 		
Wesley Hearn b9d6252
 		[GtkChild]
Wesley Hearn b9d6252
 		Gtk.IconView view_docklets;
Wesley Hearn 90669ae
@@ -174,12 +168,6 @@ namespace Plank
Wesley Hearn c358ea7
 			case "UnhideDelay":
Wesley Hearn c358ea7
 				adj_unhide_delay.value = prefs.UnhideDelay;
Wesley Hearn c358ea7
 				break;
Wesley Hearn c358ea7
-			case "ZoomEnabled":
Wesley Hearn c358ea7
-				sw_zoom_enabled.set_active (prefs.ZoomEnabled);
Wesley Hearn c358ea7
-				break;
Wesley Hearn c358ea7
-			case "ZoomPercent":
Wesley Hearn c358ea7
-				adj_zoom_percent.value = prefs.ZoomPercent;
Wesley Hearn c358ea7
-				break;
Wesley Hearn c358ea7
 			// Ignored settings
Wesley Hearn c358ea7
 			case "DockItems":
Wesley Hearn c358ea7
 				break;
9d9bd1a
@@ -265,17 +253,6 @@ namespace Plank
Wesley Hearn b9d6252
 			prefs.PressureReveal = ((Gtk.Switch) widget).get_active ();
Wesley Hearn b9d6252
 		}
9d9bd1a
 		
Wesley Hearn c358ea7
-		void zoom_enabled_toggled (GLib.Object widget, ParamSpec param)
Wesley Hearn c358ea7
-		{
Wesley Hearn c358ea7
-			if (((Gtk.Switch) widget).get_active ()) {
Wesley Hearn c358ea7
-				prefs.ZoomEnabled = true;
Wesley Hearn c358ea7
-				s_zoom_percent.sensitive = true;
Wesley Hearn c358ea7
-			} else {
Wesley Hearn c358ea7
-				prefs.ZoomEnabled = false;
Wesley Hearn c358ea7
-				s_zoom_percent.sensitive = false;
Wesley Hearn c358ea7
-			}
Wesley Hearn c358ea7
-		}
Wesley Hearn c358ea7
-		
Wesley Hearn c358ea7
 		void iconsize_changed (Gtk.Adjustment adj)
Wesley Hearn c358ea7
 		{
Wesley Hearn c358ea7
 			prefs.IconSize = (int) adj.value;
9d9bd1a
@@ -296,11 +273,6 @@ namespace Plank
Wesley Hearn c358ea7
 			prefs.UnhideDelay = (int) adj.value;
Wesley Hearn c358ea7
 		}
Wesley Hearn f99cad6
 		
Wesley Hearn c358ea7
-		void zoom_percent_changed (Gtk.Adjustment adj)
Wesley Hearn c358ea7
-		{
Wesley Hearn c358ea7
-			prefs.ZoomPercent = (int) adj.value;
Wesley Hearn c358ea7
-		}
Wesley Hearn c358ea7
-		
Wesley Hearn c358ea7
 		void monitor_changed (Gtk.ComboBox widget)
Wesley Hearn c358ea7
 		{
Wesley Hearn c358ea7
 			prefs.Monitor = ((Gtk.ComboBoxText) widget).get_active_text ();
Wesley Hearn 90669ae
@@ -318,14 +290,12 @@ namespace Plank
Wesley Hearn c358ea7
 			cb_display_plug.changed.connect (monitor_changed);
Wesley Hearn c358ea7
 			adj_iconsize.value_changed.connect (iconsize_changed);
Wesley Hearn c358ea7
 			adj_offset.value_changed.connect (offset_changed);
Wesley Hearn c358ea7
-			adj_zoom_percent.value_changed.connect (zoom_percent_changed);
Wesley Hearn c358ea7
 			sw_hide.notify["active"].connect (hide_toggled);
Wesley Hearn c358ea7
 			sw_primary_display.notify["active"].connect (primary_display_toggled);
Wesley Hearn c358ea7
 			sw_workspace_only.notify["active"].connect (workspace_only_toggled);
Wesley Hearn b9d6252
 			sw_show_unpinned.notify["active"].connect (show_unpinned_toggled);
Wesley Hearn b9d6252
 			sw_lock_items.notify["active"].connect (lock_items_toggled);
Wesley Hearn c358ea7
 			sw_pressure_reveal.notify["active"].connect (pressure_reveal_toggled);
Wesley Hearn c358ea7
-			sw_zoom_enabled.notify["active"].connect (zoom_enabled_toggled);
Wesley Hearn b9d6252
 			cb_alignment.changed.connect (alignment_changed);
Wesley Hearn b9d6252
 			cb_items_alignment.changed.connect (items_alignment_changed);
Wesley Hearn b9d6252
 		}
Wesley Hearn 90669ae
@@ -342,14 +312,12 @@ namespace Plank
Wesley Hearn b9d6252
 			cb_display_plug.changed.disconnect (monitor_changed);
Wesley Hearn b9d6252
 			adj_iconsize.value_changed.disconnect (iconsize_changed);
Wesley Hearn b9d6252
 			adj_offset.value_changed.disconnect (offset_changed);
Wesley Hearn b9d6252
-			adj_zoom_percent.value_changed.disconnect (zoom_percent_changed);
Wesley Hearn b9d6252
 			sw_hide.notify["active"].disconnect (hide_toggled);
Wesley Hearn b9d6252
 			sw_primary_display.notify["active"].disconnect (primary_display_toggled);
Wesley Hearn b9d6252
 			sw_workspace_only.notify["active"].disconnect (workspace_only_toggled);
Wesley Hearn b9d6252
 			sw_show_unpinned.notify["active"].disconnect (show_unpinned_toggled);
Wesley Hearn b9d6252
 			sw_lock_items.notify["active"].disconnect (lock_items_toggled);
Wesley Hearn b9d6252
 			sw_pressure_reveal.notify["active"].disconnect (pressure_reveal_toggled);
Wesley Hearn b9d6252
-			sw_zoom_enabled.notify["active"].disconnect (zoom_enabled_toggled);
Wesley Hearn b9d6252
 			cb_alignment.changed.disconnect (alignment_changed);
Wesley Hearn b9d6252
 			cb_items_alignment.changed.disconnect (items_alignment_changed);
Wesley Hearn c358ea7
 		}
Wesley Hearn 90669ae
@@ -388,16 +356,13 @@ namespace Plank
Wesley Hearn f99cad6
 			
Wesley Hearn c358ea7
 			adj_iconsize.value = prefs.IconSize;
Wesley Hearn c358ea7
 			adj_offset.value = prefs.Offset;
Wesley Hearn c358ea7
-			adj_zoom_percent.value = prefs.ZoomPercent;
Wesley Hearn c358ea7
 			s_offset.sensitive = (prefs.Alignment == Gtk.Align.CENTER);
Wesley Hearn c358ea7
-			s_zoom_percent.sensitive = prefs.ZoomEnabled;
Wesley Hearn c358ea7
 			sw_hide.set_active (prefs.HideMode != HideType.NONE);
Wesley Hearn c358ea7
 			sw_primary_display.set_active (prefs.Monitor == "");
Wesley Hearn c358ea7
 			sw_workspace_only.set_active (prefs.CurrentWorkspaceOnly);
Wesley Hearn b9d6252
 			sw_show_unpinned.set_active (!prefs.PinnedOnly);
Wesley Hearn b9d6252
 			sw_lock_items.set_active (prefs.LockItems);
Wesley Hearn c358ea7
 			sw_pressure_reveal.set_active (prefs.PressureReveal);
Wesley Hearn c358ea7
-			sw_zoom_enabled.set_active (prefs.ZoomEnabled);
Wesley Hearn c358ea7
 			cb_alignment.active_id = ((int) prefs.Alignment).to_string ();
Wesley Hearn c358ea7
 			cb_items_alignment.active_id = ((int) prefs.ItemsAlignment).to_string ();
Wesley Hearn c358ea7
 			cb_items_alignment.sensitive = (prefs.Alignment == Gtk.Align.FILL);