diff -urN new/libwnck-2.6.1/libwnck/pager.c orig/libwnck-2.6.1/libwnck/pager.c
--- new/libwnck-2.6.1/libwnck/pager.c	2004-05-28 14:17:06.000000000 +0200
+++ orig/libwnck-2.6.1/libwnck/pager.c	2004-04-19 16:26:52.000000000 +0200
@@ -606,7 +606,6 @@
   GdkPixbuf *icon;
   int icon_x, icon_y, icon_w, icon_h;
   gboolean is_active;
-  double r;
 
   is_active = wnck_window_is_active (win);
           
@@ -642,26 +641,8 @@
 
               /* Give up. */
               if (icon_w > (winrect->width - 2) ||
-                  icon_h > (winrect->height - 2)) 
-				{
-
-				  /* jrh: Use nano icons */
-
-				  /* Get optimal size  (also one can use a fix size!) */
-				  r = ((double)icon_h)/((double)icon_w);
-				  if (winrect->width < winrect->height) {
-					icon_w = (winrect->width - 2);
-					icon_h = (int)( (((double)icon_w)*r) + 0.499);
-				  } else {
-					icon_h = (winrect->height - 2);
-					icon_w = (int)( (((double)icon_h)/r) + 0.499);
-				  }
-
-				  icon = wnck_window_get_nano_icon(win, icon_w, icon_h);				  
-				  /* jrh: Use nano icons */
-				  
-				  
-				}
+                  icon_h > (winrect->height - 2))
+                icon = NULL;
             }
         }
     }
diff -urN new/libwnck-2.6.1/libwnck/window.c orig/libwnck-2.6.1/libwnck/window.c
--- new/libwnck-2.6.1/libwnck/window.c	2004-05-28 14:04:23.000000000 +0200
+++ orig/libwnck-2.6.1/libwnck/window.c	2004-02-03 10:54:33.000000000 +0100
@@ -68,12 +68,6 @@
   GdkPixbuf *icon;
   GdkPixbuf *mini_icon;
 
-  /* jrh: Use nano icons */
-  gboolean use_nano_icon;
-  GdkPixbuf *nano_icon;
-  /* jrh: Use nano icons */
-
-
   WnckIconCache *icon_cache;
   
   WnckWindowActions actions;
@@ -172,57 +166,6 @@
 static gpointer parent_class;
 static guint signals[LAST_SIGNAL] = { 0 };
 
-
-/* jrh: Use nano icons */
-GdkPixbuf *wnck_window_get_nano_icon(WnckWindow *window, int icon_new_w, int icon_new_h)
-{
-  GdkPixbuf *icon;
-  int icon_w, icon_h;
-
-
-  if (window->priv->use_nano_icon) {
-
-	/* Size is too small, do nothing */
-	if ( (icon_new_w<8) || (icon_new_h<8) ) {  
-	  return(NULL);
-	}
-
-	if (window->priv->nano_icon) {
-	  
-	  /* Get last icon size */
-	  icon_w = gdk_pixbuf_get_width(window->priv->nano_icon);
-	  icon_h = gdk_pixbuf_get_height(window->priv->nano_icon);
-	  
-	  /* If equal size then return last scaled icon */
-	  if ((icon_new_w==icon_w) && (icon_new_h==icon_h)) {
-		return(window->priv->nano_icon);
-	  }
-
-	} /* endif nano_icon already exists */
-
-	/* Use GDK_INTERP_NEAREST for speed, GDK_INTERP_BILINEAR for quality */
-	icon = gdk_pixbuf_scale_simple( wnck_window_get_mini_icon(window), 
-									icon_new_w, icon_new_h,
-									GDK_INTERP_BILINEAR);
-	
-	/* Delete last icon as we've created a one */
-	if (window->priv->nano_icon) {
-	  g_object_unref(G_OBJECT(window->priv->nano_icon));
-	}
-	
-	window->priv->nano_icon = icon;
-
-	return(window->priv->nano_icon);
-	
-  }
-  
-  return(NULL);
-  
-}
-/* jrh: Use nano icons */
-
-
-
 GType
 wnck_window_get_type (void)
 {
@@ -347,12 +290,6 @@
   if (window->priv->mini_icon)
     g_object_unref (G_OBJECT (window->priv->mini_icon));
   
-  /* jrh: Use nano icons */
-  if (window->priv->nano_icon)
-    g_object_unref (G_OBJECT (window->priv->nano_icon));
-  /* jrh: Use nano icons */
-
-
   _wnck_icon_cache_free (window->priv->icon_cache);
 
   g_free (window->priv->name);
@@ -460,12 +397,6 @@
   window->priv->need_update_wmclass = TRUE;
   force_update_now (window);
 
-  /* jrh: Use nano icons */
-  window->priv->use_nano_icon = TRUE;
-  window->priv->nano_icon = NULL;
-  /* jrh: Use nano icons */
-  
-
   return window;
 }
 
@@ -1182,10 +1113,6 @@
   GdkPixbuf *icon;
   GdkPixbuf *mini_icon;
 
-  GdkPixbuf *nano_icon;
-  int icon_w, icon_h;
-
-
   icon = NULL;
   mini_icon = NULL;
   
@@ -1207,35 +1134,6 @@
 
       window->priv->icon = icon;
       window->priv->mini_icon = mini_icon;
-
-	  /*jrh: Also update nano_icon */
-	  if (window->priv->use_nano_icon) {
-
-		/* Only if it exists */
-		if (window->priv->nano_icon) {
-	  
-		  /* Get last icon size */
-		  icon_w = gdk_pixbuf_get_width(window->priv->nano_icon);
-		  icon_h = gdk_pixbuf_get_height(window->priv->nano_icon);
-	  
-		  /* Use that to create new icon */
-		  /* Use GDK_INTERP_NEAREST for speed, GDK_INTERP_BILINEAR for quality */
-		  nano_icon = gdk_pixbuf_scale_simple( wnck_window_get_mini_icon(window), 
-											   icon_w, icon_h,
-											   GDK_INTERP_BILINEAR);
-
-		  /* Delete last icon as we've created a one */
-		  if (window->priv->nano_icon) {
-			g_object_unref(G_OBJECT(window->priv->nano_icon));
-		  }
-		  
-		  window->priv->nano_icon = nano_icon;
-
-		}
-
-	  }
-	  /*jrh: Also update nano_icon */
-
     }
 
   g_assert ((window->priv->icon && window->priv->mini_icon) ||
diff -urN new/libwnck-2.6.1/libwnck/window.h orig/libwnck-2.6.1/libwnck/window.h
--- new/libwnck-2.6.1/libwnck/window.h	2004-05-28 14:05:02.000000000 +0200
+++ orig/libwnck-2.6.1/libwnck/window.h	2003-12-10 12:31:37.000000000 +0100
@@ -192,10 +192,6 @@
 GdkPixbuf* wnck_window_get_icon      (WnckWindow *window);
 GdkPixbuf* wnck_window_get_mini_icon (WnckWindow *window);
 
-/* jrh: Use nano icons */
-GdkPixbuf *wnck_window_get_nano_icon (WnckWindow *window, int icon_new_w, int icon_new_h);
-/* jrh: Use nano icons */
-
 gboolean wnck_window_get_icon_is_fallback (WnckWindow *window);
 
 void wnck_window_set_icon_geometry        (WnckWindow *window,
