diff -u freeciv-Mar-2/client/tilespec.h freeciv/client/tilespec.h
--- freeciv-Mar-2/client/tilespec.h	Mon Feb 25 04:03:50 2002
+++ freeciv/client/tilespec.h	Fri Mar  8 23:01:32 2002
@@ -85,6 +85,7 @@
     *citizen[NUM_TILES_CITIZEN],   /* internal code... */
     *treaty_thumb[2],     /* 0=disagree, 1=agree */
     *right_arrow,
+    *fundamentalism, /*Not used as a government, but needed as a combat-icon*/
     *black_tile,      /* only used for isometric view */
     *dither_tile,     /* only used for isometric view */
     *coast_color;     /* only used for isometric view */
diff -u freeciv-Mar-2/client/tilespec.c freeciv/client/tilespec.c
--- freeciv-Mar-2/client/tilespec.c	Tue Feb 26 03:00:16 2002
+++ freeciv/client/tilespec.c	Fri Mar  8 23:02:38 2002
@@ -447,6 +447,8 @@
   SET_SPRITE(treaty_thumb[0], "treaty.disagree_thumb_down");
   SET_SPRITE(treaty_thumb[1], "treaty.agree_thumb_up");
 
+  SET_SPRITE(fundamentalism, "gov.fundamentalism");
+
   for(i=0; i<NUM_TILES_PROGRESS; i++) {
     my_snprintf(buffer, sizeof(buffer), "s.science_bulb_%d", i);
     SET_SPRITE(bulb[i], buffer);
diff -u freeciv-Mar-2/client/gui-gtk/messagewin.c freeciv/client/gui-gtk/messagewin.c
--- freeciv-Mar-2/client/gui-gtk/messagewin.c	Wed Feb 13 02:15:51 2002
+++ freeciv/client/gui-gtk/messagewin.c	Fri Mar  8 23:14:02 2002
@@ -24,6 +24,7 @@
 #include "events.h"
 #include "fcintl.h"
 #include "game.h"
+#include "government.h"
 #include "map.h"
 #include "mem.h"
 #include "packets.h"
@@ -37,6 +38,7 @@
 #include "gui_stuff.h"
 #include "mapview.h"
 #include "options.h"
+#include "tilespec.h"
 
 #include "messagewin.h"
 
@@ -61,6 +63,75 @@
 
 static int delay_meswin_update=0;
 
+static struct Sprite* event_sprites[E_LAST];
+
+static int event_sprites_initialized = 0;
+
+static void init_event_sprites(void)
+{
+  int start_x, start_y, end_x, end_y;
+  static struct Sprite food, shield, flag;
+
+  sprite_get_bounding_box(sprites.upkeep.food[0], &start_x, &start_y, &end_x, &end_y);
+  food = *crop_sprite(sprites.upkeep.food[0], start_x, start_y, end_x, end_y);
+
+  sprite_get_bounding_box(sprites.upkeep.shield, &start_x, &start_y, &end_x, &end_y);
+  shield = *crop_sprite(sprites.upkeep.shield, start_x, start_y, end_x, end_y);
+
+  /*  sprite_get_bounding_box(sprites.upkeep.unhappy[1], &start_x, &start_y, &end_x, &end_y);
+      meet = *crop_sprite(sprites.upkeep.unhappy[1], start_x, start_y, end_x, end_y);*/
+
+  event_sprites[E_LOW_ON_FUNDS]              = sprites.citizen[2];
+  event_sprites[E_POLLUTION]                 = sprites.warming[5];
+  event_sprites[E_GLOBAL_ECO]                = sprites.warming[7];
+  event_sprites[E_CITY_DISORDER]             = sprites.citizen[7];
+  event_sprites[E_CITY_LOVE]                 = sprites.citizen[5];
+  event_sprites[E_CITY_NORMAL]               = sprites.citizen[3];
+  event_sprites[E_CITY_GROWTH]               = &food;
+  event_sprites[E_CITY_AQUEDUCT]             = &food;
+  event_sprites[E_CITY_FAMINE]               = &food;
+  event_sprites[E_CITY_LOST]                 = &food;
+  event_sprites[E_CITY_CANTBUILD]            = &shield;
+  event_sprites[E_WONDER_STARTED]            = sprites.warming[2];
+  event_sprites[E_WONDER_BUILD]              = &shield;
+  event_sprites[E_IMP_BUILD]                 = &shield;
+  event_sprites[E_IMP_AUTO]                  = &shield;
+  event_sprites[E_IMP_AUCTIONED]             = sprites.citizen[2];
+  event_sprites[E_UNIT_UPGRADED]             = sprites.fundamentalism;
+  event_sprites[E_UNIT_BUILD]                = &shield;
+  event_sprites[E_UNIT_LOST]                 = sprites.fundamentalism;
+  event_sprites[E_UNIT_WIN]                  = sprites.fundamentalism;
+  event_sprites[E_ANARCHY]                   = governments[0].sprite;
+  event_sprites[E_DIPLOMATED]                = sprites.citizen[3];
+  event_sprites[E_TECH_GAIN]                 = sprites.bulb[7];
+  event_sprites[E_DESTROYED]                 = sprites.city.occupied;
+  event_sprites[E_IMP_BUY]                   = &shield;
+  event_sprites[E_IMP_SOLD]                  = sprites.citizen[2];
+  event_sprites[E_UNIT_BUY]                  = sprites.city.occupied;
+  event_sprites[E_WONDER_STOPPED]            = sprites.warming[2];
+  event_sprites[E_CITY_AQ_BUILDING]          = sprites.upkeep.shield;
+  event_sprites[E_MY_DIPLOMAT]               = sprites.citizen[3];
+  event_sprites[E_UNIT_LOST_ATT]             = sprites.fundamentalism;
+  event_sprites[E_UNIT_WIN_ATT]              = &flag;
+  event_sprites[E_CITY_GRAN_THROTTLE]        = sprites.upkeep.food[0];
+  event_sprites[E_SPACESHIP]                 = sprites.bulb[7];
+  event_sprites[E_UPRISING]                  = governments[0].sprite;
+  event_sprites[E_WORKLIST]                  = &shield;
+  event_sprites[E_CANCEL_PACT]               = sprites.citizen[3];
+  event_sprites[E_DIPL_INCIDENT]             = sprites.citizen[3];
+  event_sprites[E_FIRST_CONTACT]             = sprites.cooling[1];
+  event_sprites[E_CITY_MAY_SOON_GROW]        = &food;
+  event_sprites[E_WONDER_OBSOLETE]           = sprites.warming[2];
+  event_sprites[E_CITY_FAMINE_FEARED]        = &food;
+  event_sprites[E_CITY_WONDER_WILL_BE_BUILT] = sprites.warming[2];
+  event_sprites[E_NEW_GOVERNMENT]            = governments[2].sprite;
+  event_sprites[E_CITY_NUKED]                = sprites.explode.iso_nuke;
+  event_sprites[E_MESSAGE_WALL]              = sprites.warming[0];
+  event_sprites[E_CITY_CMA_RELEASE]          = sprites.warming[0];
+  event_sprites_initialized = TRUE;
+}
+
+
 /******************************************************************
  Turn off updating of message window
 *******************************************************************/
@@ -122,12 +193,12 @@
 *****************************************************************/
 void create_meswin_dialog(void)
 {
-  static gchar *titles_[1] = { N_("Messages") };
+  static gchar *titles_[2] = { "", N_("Messages") };
   static gchar **titles;
   GtkWidget *scrolled;
   GtkAccelGroup *accel = gtk_accel_group_new();
 
-  if (!titles) titles = intl_slist(1, titles_);
+  if (!titles) titles = intl_slist(2, titles_);
 
   meswin_dialog_shell = gtk_dialog_new();
   gtk_signal_connect( GTK_OBJECT(meswin_dialog_shell),"delete_event",
@@ -136,8 +207,9 @@
 
   gtk_window_set_title( GTK_WINDOW(meswin_dialog_shell), _("Messages") );
 
-  meswin_list = gtk_clist_new_with_titles(1, titles);
+  meswin_list = gtk_clist_new_with_titles(2, titles);
   gtk_clist_column_titles_passive(GTK_CLIST(meswin_list));
+  gtk_clist_set_column_width(GTK_CLIST(meswin_list), 0, 15);
   scrolled = gtk_scrolled_window_new(NULL,NULL);
   gtk_container_add(GTK_CONTAINER(scrolled),meswin_list);
   gtk_scrolled_window_set_policy( GTK_SCROLLED_WINDOW( scrolled ),
@@ -208,6 +280,7 @@
 static int messages_total = 0; /* current total number of message lines */
 static int messages_alloc = 0; /* number allocated for */
 static char **string_ptrs = NULL;
+static struct Sprite **sprite_ptrs = NULL;
 static int *xpos = NULL;
 static int *ypos = NULL;
 static int *event = NULL;
@@ -226,11 +299,13 @@
   if (messages_total+2 > messages_alloc) {
     messages_alloc = messages_total + 32;
     string_ptrs = fc_realloc(string_ptrs, messages_alloc*sizeof(char*));
+    sprite_ptrs = fc_realloc(sprite_ptrs, messages_alloc*sizeof(char*));
     xpos = fc_realloc(xpos, messages_alloc*sizeof(int));
     ypos = fc_realloc(ypos, messages_alloc*sizeof(int));
     event = fc_realloc(event, messages_alloc*sizeof(int));
     for( i=messages_total; i<messages_alloc; i++ ) {
       string_ptrs[i] = NULL;
+      sprite_ptrs[i] = NULL;
       xpos[i] = 0;
       ypos[i] = 0;
       event[i] = E_NOEVENT;
@@ -249,6 +324,7 @@
   for (i = 0; i <messages_total; i++) {
     free(string_ptrs[i]);
     string_ptrs[i] = NULL;
+    sprite_ptrs[i] = NULL;
     xpos[i] = 0;
     ypos[i] = 0;
     event[i] = E_NOEVENT;
@@ -275,6 +351,9 @@
   int gp_len2 = strlen(game_prefix2);
 
   meswin_allocate();
+  if (!event_sprites_initialized){
+    init_event_sprites();
+  }
   s = fc_malloc(strlen(packet->message) + 50);
   if (strncmp(packet->message, game_prefix1, gp_len1) == 0) {
     strcpy(s, packet->message + gp_len1);
@@ -292,6 +371,7 @@
   ypos[messages_total] = packet->y;
   event[messages_total]= packet->event;
   string_ptrs[messages_total] = s;
+  sprite_ptrs[messages_total] = event_sprites[packet->event];
   messages_total++;
   string_ptrs[messages_total] = NULL;
   if (!delay_meswin_update) {
@@ -324,6 +404,9 @@
 **************************************************************************/
 void update_meswin_dialog(void)
 {
+  char *row_text[2];
+  row_text[0]="";
+
   if (!meswin_dialog_shell) { 
     if (messages_total > 0 &&
         (!game.player_ptr->ai.control || ai_popup_windows)) {
@@ -342,8 +425,12 @@
 
      for (i=0; i<messages_total; i++)
      {
-       gtk_clist_append (GTK_CLIST (meswin_list), &string_ptrs[i]);
+       int row;
+       row_text[1]=string_ptrs[i];
+       row = gtk_clist_append (GTK_CLIST (meswin_list), row_text);
        meswin_not_visited_item (i);
+       gtk_clist_set_pixmap(GTK_CLIST (meswin_list), row, 0,
+			    sprite_ptrs[i]->pixmap, sprite_ptrs[i]->mask);
      }
 
      gtk_clist_thaw(GTK_CLIST(meswin_list));