diff --git a/ChangeLog b/ChangeLog
index 5d3a79ec859feab4c34eccb23ae3825a508c2af1..8e60b5b8616f19e9e7aa7d1b65c8984c5c96a975 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2006-11-03	Benedikt Meurer <benny@xfce.org>
+
+	* thunar/thunar-icon-renderer.c(thunar_icon_renderer_render): Make sure
+	  emblems don't get too large with SVG icon themes. Bug #2466.
+
 2006-11-03	Benedikt Meurer <benny@xfce.org>
 
 	* thunar/thunar-trash-action.{c,h}, thunar/Makefile.am,
diff --git a/thunar/thunar-icon-renderer.c b/thunar/thunar-icon-renderer.c
index 39635ac553312c7dab233152e37f3f8f1ffd2069..fbaeb5699b7942f9b45bd0a53bfebbd4f7a61f74 100644
--- a/thunar/thunar-icon-renderer.c
+++ b/thunar/thunar-icon-renderer.c
@@ -504,10 +504,10 @@ thunar_icon_renderer_render (GtkCellRenderer     *renderer,
               emblem_area.height = gdk_pixbuf_get_height (emblem);
 
               /* shrink insane emblems */
-              if (G_UNLIKELY (MAX (emblem_area.width, emblem_area.height) > (2 * icon_renderer->size) / 3))
+              if (G_UNLIKELY (MAX (emblem_area.width, emblem_area.height) > MIN ((2 * icon_renderer->size) / 3, 36)))
                 {
                   /* scale down the emblem */
-                  temp = exo_gdk_pixbuf_scale_ratio (emblem, (2 * icon_renderer->size) / 3);
+                  temp = exo_gdk_pixbuf_scale_ratio (emblem, MIN ((2 * icon_renderer->size) / 3, 36));
                   g_object_unref (G_OBJECT (emblem));
                   emblem = temp;