=== modified file 'src/xdisp.c'
--- src/xdisp.c	2013-12-04 18:46:47 +0000
+++ src/xdisp.c	2013-12-09 08:30:57 +0000
@@ -11937,6 +11937,8 @@
   int max_x = it->last_visible_x;
   struct glyph *last;
 
+  /* Don't extend on a previously drawn tool bar items (Bug#16058).  */
+  row->enabled_p = 0;
   prepare_desired_row (row);
   row->y = it->current_y;