diff --git a/collects/mrlib/bitmap-label.ss b/collects/mrlib/bitmap-label.ss
index 80a86fd0..2ca2450e 100644
--- a/collects/mrlib/bitmap-label.ss
+++ b/collects/mrlib/bitmap-label.ss
@@ -15,7 +15,7 @@
      [(text filename-or-bitmap)
       (lambda (area-container-window)
 	(let*-values ([(outside-margin) 2]
-		      [(font) (send area-container-window get-control-font)]
+		      [(font) normal-control-font]
 		      [(img-bitmap-dc img-bitmap img-width img-height)
 		       (let ([mdc (make-object bitmap-dc%)]
 			     [q (if (filename-or-bitmap . is-a? . bitmap%)
diff --git a/collects/mrlib/name-message.ss b/collects/mrlib/name-message.ss
index 8eb43a44..81a3c91b 100644
--- a/collects/mrlib/name-message.ss
+++ b/collects/mrlib/name-message.ss
@@ -142,14 +142,7 @@
       (stretchable-width #f)
       (stretchable-height #f)))
   
-  (define button-label-font
-    (case (system-type)
-      [(windows)
-       (send the-font-list find-or-create-font 8 'decorative 'normal 'normal #f)]
-      [(macosx)
-       (send the-font-list find-or-create-font 11 'system 'normal 'bold #f)]
-      [else
-       (send the-font-list find-or-create-font 10 'decorative 'normal 'normal #f)]))
+  (define button-label-font small-control-font)
   
   (define button-label-inset 1)
   (define black-color (make-object color% "BLACK"))