diff --git a/collects/typed-racket/optimizer/tool/tool.rkt b/collects/typed-racket/optimizer/tool/tool.rkt
index 3c36a45ddb..4ca0654dc3 100644
--- a/collects/typed-racket/optimizer/tool/tool.rkt
+++ b/collects/typed-racket/optimizer/tool/tool.rkt
@@ -8,7 +8,7 @@
 
 (require "report.rkt" "display.rkt")
 
-(provide tool@)
+(provide tool@ optimization-coach-drracket-button)
 
 ;; DrRacket tool for reporting missed optimizations in the editor.
 
@@ -36,22 +36,18 @@
 
 (define-local-member-name get-coach-menu-item)
 
+(define optimization-coach-drracket-button
+  (list
+   "Optimization Coach"
+   optimization-coach-bitmap
+   optimization-coach-callback))
+
 (define-unit tool@
 
   (import drracket:tool^)
   (export drracket:tool-exports^)
 
-  (define (phase1)
-    (drracket:module-language-tools:add-opt-out-toolbar-button
-     (lambda (frame parent)
-       (new switchable-button%
-            [label "Optimization Coach"]
-            [callback (lambda (btn)
-                        (optimization-coach-callback frame))]
-            [parent parent]
-            [bitmap optimization-coach-bitmap]))
-     'optimization-coach
-     #:number 75))
+  (define (phase1) (void))
   (define (phase2) (void))
 
   (define highlights-mixin
diff --git a/collects/typed-scheme/lang/reader.rkt b/collects/typed-scheme/lang/reader.rkt
index 876f259f81..56eb29463b 100644
--- a/collects/typed-scheme/lang/reader.rkt
+++ b/collects/typed-scheme/lang/reader.rkt
@@ -10,4 +10,7 @@ typed-scheme
 
 (define (make-info key default use-default)
   (case key
+    [(drscheme:toolbar-buttons)
+     (list (dynamic-require 'typed-racket/optimizer/tool/tool
+                            'optimization-coach-drracket-button))]
     [else (use-default key default)]))
diff --git a/collects/typed/racket/base/lang/reader.rkt b/collects/typed/racket/base/lang/reader.rkt
index 849ff945b1..053ed28db3 100644
--- a/collects/typed/racket/base/lang/reader.rkt
+++ b/collects/typed/racket/base/lang/reader.rkt
@@ -9,6 +9,9 @@ typed/racket/base
 
 (define (make-info key default use-default)
   (case key
+    [(drscheme:toolbar-buttons)
+     (list (dynamic-require 'typed-racket/optimizer/tool/tool
+                            'optimization-coach-drracket-button))]
     [else (use-default key default)]))
 
 (define make-language-info
diff --git a/collects/typed/racket/lang/reader.rkt b/collects/typed/racket/lang/reader.rkt
index 257a2ae40c..1252857c29 100644
--- a/collects/typed/racket/lang/reader.rkt
+++ b/collects/typed/racket/lang/reader.rkt
@@ -9,6 +9,9 @@ typed/racket
 
 (define (make-info key default use-default)
   (case key
+    [(drscheme:toolbar-buttons)
+     (list (dynamic-require 'typed-racket/optimizer/tool/tool
+                            'optimization-coach-drracket-button))]
     [else (use-default key default)]))
 
 (define make-language-info
diff --git a/collects/typed/scheme/base/lang/reader.rkt b/collects/typed/scheme/base/lang/reader.rkt
index 6da86b0d5f..490d0faa2e 100644
--- a/collects/typed/scheme/base/lang/reader.rkt
+++ b/collects/typed/scheme/base/lang/reader.rkt
@@ -9,6 +9,9 @@ typed/scheme/base
 
 (define (make-info key default use-default)
   (case key
+    [(drscheme:toolbar-buttons)
+     (list (dynamic-require 'typed-racket/optimizer/tool/tool
+                            'optimization-coach-drracket-button))]
     [else (use-default key default)]))
 
 (define make-language-info
diff --git a/collects/typed/scheme/lang/reader.rkt b/collects/typed/scheme/lang/reader.rkt
index 2f51e90f83..a909f9f082 100644
--- a/collects/typed/scheme/lang/reader.rkt
+++ b/collects/typed/scheme/lang/reader.rkt
@@ -9,6 +9,9 @@ typed/scheme
 
 (define (make-info key default use-default)
   (case key
+    [(drscheme:toolbar-buttons)
+     (list (dynamic-require 'typed-racket/optimizer/tool/tool
+                            'optimization-coach-drracket-button))]
     [else (use-default key default)]))
 
 (define make-language-info