diff --git a/src/gmtool.c b/src/gmtool.c
index 5d1ce1227..c20de22bf 100644
--- a/src/gmtool.c
+++ b/src/gmtool.c
@@ -223,13 +223,19 @@ mr_tile(const map_region * mr, int highlight)
       } else if (r->terrain->_name[1]=='i') { /* firewall */
         return '%' | COLOR_PAIR(hl + COLOR_RED) | A_BOLD;
       }
+      break;
     case 'h' :
       return 'H' | COLOR_PAIR(hl + COLOR_YELLOW) | A_NORMAL;
     case 'm' :
       return '^' | COLOR_PAIR(hl + COLOR_WHITE) | A_NORMAL;
     case 'p' :
-      if (r_isforest(r)) return '#' | COLOR_PAIR(hl + COLOR_GREEN) | A_NORMAL;
-      return '+' | COLOR_PAIR(hl + COLOR_GREEN) | A_BOLD;
+      if (r->terrain->_name[1]=='l') { /* plain */
+        if (r_isforest(r)) return '#' | COLOR_PAIR(hl + COLOR_GREEN) | A_NORMAL;
+        return '+' | COLOR_PAIR(hl + COLOR_GREEN) | A_BOLD;
+      } else if (r->terrain->_name[1]=='l') { /* packice */
+        return ':' | COLOR_PAIR(hl + COLOR_WHITE) | A_BOLD;
+      }
+      break;
     case 'g' :
       return '*' | COLOR_PAIR(hl + COLOR_WHITE) | A_BOLD;
     case 's' :
diff --git a/src/util/listbox.c b/src/util/listbox.c
index 508d5bd3c..b04840a3c 100644
--- a/src/util/listbox.c
+++ b/src/util/listbox.c
@@ -13,6 +13,7 @@
 #include <curses.h>
 
 #include "listbox.h"
+#include "gmtool_structs.h"
 
 #include <string.h>
 #include <ctype.h>
@@ -94,7 +95,7 @@ do_selection(list_selection * sel, const char * title, void (*perform)(list_sele
         waddnstr(wn, s->str, -1);
         wclrtoeol(wn);
       }
-      wborder(wn, 0, 0, 0, 0, 0, 0, 0, 0);
+      wxborder(wn);
       mvwprintw(wn, 0, 2, "[ %s ]", title);
       update = false;
     }