diff --git a/basis/compiler/errors/errors.factor b/basis/compiler/errors/errors.factor
index 41c2af320f..a0f5c8f013 100644
--- a/basis/compiler/errors/errors.factor
+++ b/basis/compiler/errors/errors.factor
@@ -33,7 +33,7 @@ T{ error-type-holder
    { type +compiler-error+ }
    { word ":errors" }
    { plural "compiler errors" }
-   { icon "vocab:ui/tools/error-list/icons/compiler-error.tiff" }
+   { icon "vocab:ui/tools/error-list/icons/compiler-error.png" }
    { quot [ compiler-errors get values ] }
    { forget-quot [ compiler-errors get delete-at ] }
 } define-error-type
@@ -51,7 +51,7 @@ T{ error-type-holder
    { type +linkage-error+ }
    { word ":linkage" }
    { plural "linkage errors" }
-   { icon "vocab:ui/tools/error-list/icons/linkage-error.tiff" }
+   { icon "vocab:ui/tools/error-list/icons/linkage-error.png" }
    { quot [ linkage-errors get values ] }
    { forget-quot [ linkage-errors get delete-at ] }
    { fatal? f }
@@ -77,7 +77,7 @@ T{ error-type-holder
     { type +user-init-error+ }
     { word ":user-init-errors" }
     { plural "rc file errors" }
-    { icon "vocab:ui/tools/error-list/icons/user-init-error.tiff" }
+    { icon "vocab:ui/tools/error-list/icons/user-init-error.png" }
     { quot [ user-init-errors get-global values ] }
     { forget-quot [ user-init-errors get-global delete-at ] }
 } define-error-type
diff --git a/basis/help/lint/lint.factor b/basis/help/lint/lint.factor
index c126b956be..7a24694d29 100644
--- a/basis/help/lint/lint.factor
+++ b/basis/help/lint/lint.factor
@@ -18,7 +18,7 @@ T{ error-type-holder
    { type +help-lint-failure+ }
    { word ":lint-failures" }
    { plural "help lint failures" }
-   { icon "vocab:ui/tools/error-list/icons/help-lint-error.tiff" }
+   { icon "vocab:ui/tools/error-list/icons/help-lint-error.png" }
    { quot [ lint-failures get values ] }
    { forget-quot [ lint-failures get delete-at ] }
 } define-error-type
diff --git a/basis/tools/deprecation/deprecation.factor b/basis/tools/deprecation/deprecation.factor
index a0a694c595..0fa71c12a8 100644
--- a/basis/tools/deprecation/deprecation.factor
+++ b/basis/tools/deprecation/deprecation.factor
@@ -25,7 +25,7 @@ T{ error-type-holder
     { type +deprecation-note+ }
     { word ":deprecations" }
     { plural "deprecated word usages" }
-    { icon "vocab:ui/tools/error-list/icons/deprecation-note.tiff" }
+    { icon "vocab:ui/tools/error-list/icons/deprecation-note.png" }
     { quot [ deprecation-notes get values ] }
     { forget-quot [ deprecation-notes get delete-at ] }
     { fatal? f }
diff --git a/basis/tools/test/test.factor b/basis/tools/test/test.factor
index 5449c2ac9d..533b675526 100644
--- a/basis/tools/test/test.factor
+++ b/basis/tools/test/test.factor
@@ -26,7 +26,7 @@ T{ error-type-holder
    { type +test-failure+ }
    { word ":test-failures" }
    { plural "unit test failures" }
-   { icon "vocab:ui/tools/error-list/icons/unit-test-error.tiff" }
+   { icon "vocab:ui/tools/error-list/icons/unit-test-error.png" }
    { quot [ test-failures get ] }
 } define-error-type
 
diff --git a/basis/ui/tools/error-list/error-list-docs.factor b/basis/ui/tools/error-list/error-list-docs.factor
index b2bf64aed8..a159dc8d73 100644
--- a/basis/ui/tools/error-list/error-list-docs.factor
+++ b/basis/ui/tools/error-list/error-list-docs.factor
@@ -8,13 +8,13 @@ $nl
 { $heading "Message icons" }
 { $table
     { { $strong "Icon" } { $strong "Message type" } { $strong "Reference" } }
-    ! { { $image "vocab:ui/tools/error-list/icons/note.tiff" } "Parser note" { $link "parser" } }
-    ! { { $image "vocab:ui/tools/error-list/icons/syntax-error.tiff" } "Syntax error" { $link "syntax" } }
-    { { $image "vocab:ui/tools/error-list/icons/compiler-error.tiff" } "Compiler error" { $link "compiler-errors" } }
-    { { $image "vocab:ui/tools/error-list/icons/linkage-error.tiff" } "Linkage error" { $link "loading-libs" } }
-    { { $image "vocab:ui/tools/error-list/icons/help-lint-error.tiff" } "Help lint failure" { $link "help.lint" } }
-    { { $image "vocab:ui/tools/error-list/icons/unit-test-error.tiff" } "Unit test failure" { $link "tools.test" } }
-    { { $image "vocab:ui/tools/error-list/icons/deprecation-note.tiff" } "Deprecated words used" { $link "tools.deprecation" } }
+    ! { { $image "vocab:ui/tools/error-list/icons/note.png" } "Parser note" { $link "parser" } }
+    ! { { $image "vocab:ui/tools/error-list/icons/syntax-error.png" } "Syntax error" { $link "syntax" } }
+    { { $image "vocab:ui/tools/error-list/icons/compiler-error.png" } "Compiler error" { $link "compiler-errors" } }
+    { { $image "vocab:ui/tools/error-list/icons/linkage-error.png" } "Linkage error" { $link "loading-libs" } }
+    { { $image "vocab:ui/tools/error-list/icons/help-lint-error.png" } "Help lint failure" { $link "help.lint" } }
+    { { $image "vocab:ui/tools/error-list/icons/unit-test-error.png" } "Unit test failure" { $link "tools.test" } }
+    { { $image "vocab:ui/tools/error-list/icons/deprecation-note.png" } "Deprecated words used" { $link "tools.deprecation" } }
 } ;
 
 ABOUT: "ui.tools.error-list"
diff --git a/basis/ui/tools/error-list/error-list.factor b/basis/ui/tools/error-list/error-list.factor
index e4a9298c28..00b1a93147 100644
--- a/basis/ui/tools/error-list/error-list.factor
+++ b/basis/ui/tools/error-list/error-list.factor
@@ -15,7 +15,7 @@ ui.tools.inspector ;
 IN: ui.tools.error-list
 
 CONSTANT: source-file-icon
-    T{ image-name f "vocab:ui/tools/error-list/icons/source-file.tiff" }
+    T{ image-name f "vocab:ui/tools/error-list/icons/source-file.png" }
 
 MEMO: error-icon ( type -- image-name )
     error-icon-path <image-name> ;
diff --git a/basis/ui/tools/error-list/icons/compiler-error.png b/basis/ui/tools/error-list/icons/compiler-error.png
new file mode 100644
index 0000000000..21051a9571
Binary files /dev/null and b/basis/ui/tools/error-list/icons/compiler-error.png differ
diff --git a/basis/ui/tools/error-list/icons/compiler-error.tiff b/basis/ui/tools/error-list/icons/compiler-error.tiff
deleted file mode 100644
index 7a53d578fa..0000000000
Binary files a/basis/ui/tools/error-list/icons/compiler-error.tiff and /dev/null differ
diff --git a/basis/ui/tools/error-list/icons/compiler-error@2x.png b/basis/ui/tools/error-list/icons/compiler-error@2x.png
new file mode 100644
index 0000000000..d089e4ee29
Binary files /dev/null and b/basis/ui/tools/error-list/icons/compiler-error@2x.png differ
diff --git a/basis/ui/tools/error-list/icons/compiler-error@2x.tiff b/basis/ui/tools/error-list/icons/compiler-error@2x.tiff
deleted file mode 100644
index 6217bff3b0..0000000000
Binary files a/basis/ui/tools/error-list/icons/compiler-error@2x.tiff and /dev/null differ
diff --git a/basis/ui/tools/error-list/icons/deprecation-note.png b/basis/ui/tools/error-list/icons/deprecation-note.png
new file mode 100644
index 0000000000..a579ca31b6
Binary files /dev/null and b/basis/ui/tools/error-list/icons/deprecation-note.png differ
diff --git a/basis/ui/tools/error-list/icons/deprecation-note.tiff b/basis/ui/tools/error-list/icons/deprecation-note.tiff
deleted file mode 100644
index 1eef0ef52c..0000000000
Binary files a/basis/ui/tools/error-list/icons/deprecation-note.tiff and /dev/null differ
diff --git a/basis/ui/tools/error-list/icons/deprecation-note@2x.png b/basis/ui/tools/error-list/icons/deprecation-note@2x.png
new file mode 100644
index 0000000000..f70fe77e17
Binary files /dev/null and b/basis/ui/tools/error-list/icons/deprecation-note@2x.png differ
diff --git a/basis/ui/tools/error-list/icons/deprecation-note@2x.tiff b/basis/ui/tools/error-list/icons/deprecation-note@2x.tiff
deleted file mode 100644
index 1f44884189..0000000000
Binary files a/basis/ui/tools/error-list/icons/deprecation-note@2x.tiff and /dev/null differ
diff --git a/basis/ui/tools/error-list/icons/help-lint-error.png b/basis/ui/tools/error-list/icons/help-lint-error.png
new file mode 100644
index 0000000000..4fe81937d5
Binary files /dev/null and b/basis/ui/tools/error-list/icons/help-lint-error.png differ
diff --git a/basis/ui/tools/error-list/icons/help-lint-error.tiff b/basis/ui/tools/error-list/icons/help-lint-error.tiff
deleted file mode 100644
index 464728a70c..0000000000
Binary files a/basis/ui/tools/error-list/icons/help-lint-error.tiff and /dev/null differ
diff --git a/basis/ui/tools/error-list/icons/help-lint-error@2x.png b/basis/ui/tools/error-list/icons/help-lint-error@2x.png
new file mode 100644
index 0000000000..d6e26b0049
Binary files /dev/null and b/basis/ui/tools/error-list/icons/help-lint-error@2x.png differ
diff --git a/basis/ui/tools/error-list/icons/help-lint-error@2x.tiff b/basis/ui/tools/error-list/icons/help-lint-error@2x.tiff
deleted file mode 100644
index cdab8f5845..0000000000
Binary files a/basis/ui/tools/error-list/icons/help-lint-error@2x.tiff and /dev/null differ
diff --git a/basis/ui/tools/error-list/icons/linkage-error.png b/basis/ui/tools/error-list/icons/linkage-error.png
new file mode 100644
index 0000000000..630f7d6330
Binary files /dev/null and b/basis/ui/tools/error-list/icons/linkage-error.png differ
diff --git a/basis/ui/tools/error-list/icons/linkage-error.tiff b/basis/ui/tools/error-list/icons/linkage-error.tiff
deleted file mode 100644
index 78644fd819..0000000000
Binary files a/basis/ui/tools/error-list/icons/linkage-error.tiff and /dev/null differ
diff --git a/basis/ui/tools/error-list/icons/linkage-error@2x.png b/basis/ui/tools/error-list/icons/linkage-error@2x.png
new file mode 100644
index 0000000000..b673efc304
Binary files /dev/null and b/basis/ui/tools/error-list/icons/linkage-error@2x.png differ
diff --git a/basis/ui/tools/error-list/icons/linkage-error@2x.tiff b/basis/ui/tools/error-list/icons/linkage-error@2x.tiff
deleted file mode 100644
index 91219e5020..0000000000
Binary files a/basis/ui/tools/error-list/icons/linkage-error@2x.tiff and /dev/null differ
diff --git a/basis/ui/tools/error-list/icons/note.png b/basis/ui/tools/error-list/icons/note.png
new file mode 100644
index 0000000000..b2761dec64
Binary files /dev/null and b/basis/ui/tools/error-list/icons/note.png differ
diff --git a/basis/ui/tools/error-list/icons/note.tiff b/basis/ui/tools/error-list/icons/note.tiff
deleted file mode 100644
index 834dea6b82..0000000000
Binary files a/basis/ui/tools/error-list/icons/note.tiff and /dev/null differ
diff --git a/basis/ui/tools/error-list/icons/note@2x.png b/basis/ui/tools/error-list/icons/note@2x.png
new file mode 100644
index 0000000000..8084098e4c
Binary files /dev/null and b/basis/ui/tools/error-list/icons/note@2x.png differ
diff --git a/basis/ui/tools/error-list/icons/note@2x.tiff b/basis/ui/tools/error-list/icons/note@2x.tiff
deleted file mode 100644
index d7e537cfbf..0000000000
Binary files a/basis/ui/tools/error-list/icons/note@2x.tiff and /dev/null differ
diff --git a/basis/ui/tools/error-list/icons/source-file.png b/basis/ui/tools/error-list/icons/source-file.png
new file mode 100644
index 0000000000..05bdc1a20d
Binary files /dev/null and b/basis/ui/tools/error-list/icons/source-file.png differ
diff --git a/basis/ui/tools/error-list/icons/source-file.tiff b/basis/ui/tools/error-list/icons/source-file.tiff
deleted file mode 100644
index 3a6157f92a..0000000000
Binary files a/basis/ui/tools/error-list/icons/source-file.tiff and /dev/null differ
diff --git a/basis/ui/tools/error-list/icons/source-file@2x.png b/basis/ui/tools/error-list/icons/source-file@2x.png
new file mode 100644
index 0000000000..8392b6f6e2
Binary files /dev/null and b/basis/ui/tools/error-list/icons/source-file@2x.png differ
diff --git a/basis/ui/tools/error-list/icons/source-file@2x.tiff b/basis/ui/tools/error-list/icons/source-file@2x.tiff
deleted file mode 100644
index 96546df38a..0000000000
Binary files a/basis/ui/tools/error-list/icons/source-file@2x.tiff and /dev/null differ
diff --git a/basis/ui/tools/error-list/icons/syntax-error.png b/basis/ui/tools/error-list/icons/syntax-error.png
new file mode 100644
index 0000000000..6b8c28f8ce
Binary files /dev/null and b/basis/ui/tools/error-list/icons/syntax-error.png differ
diff --git a/basis/ui/tools/error-list/icons/syntax-error.tiff b/basis/ui/tools/error-list/icons/syntax-error.tiff
deleted file mode 100644
index 5446c80e15..0000000000
Binary files a/basis/ui/tools/error-list/icons/syntax-error.tiff and /dev/null differ
diff --git a/basis/ui/tools/error-list/icons/syntax-error@2x.png b/basis/ui/tools/error-list/icons/syntax-error@2x.png
new file mode 100644
index 0000000000..5addda713a
Binary files /dev/null and b/basis/ui/tools/error-list/icons/syntax-error@2x.png differ
diff --git a/basis/ui/tools/error-list/icons/syntax-error@2x.tiff b/basis/ui/tools/error-list/icons/syntax-error@2x.tiff
deleted file mode 100644
index 6bcd4c361d..0000000000
Binary files a/basis/ui/tools/error-list/icons/syntax-error@2x.tiff and /dev/null differ
diff --git a/basis/ui/tools/error-list/icons/unit-test-error.png b/basis/ui/tools/error-list/icons/unit-test-error.png
new file mode 100644
index 0000000000..edf5b0bfd2
Binary files /dev/null and b/basis/ui/tools/error-list/icons/unit-test-error.png differ
diff --git a/basis/ui/tools/error-list/icons/unit-test-error.tiff b/basis/ui/tools/error-list/icons/unit-test-error.tiff
deleted file mode 100644
index b6ea439f5a..0000000000
Binary files a/basis/ui/tools/error-list/icons/unit-test-error.tiff and /dev/null differ
diff --git a/basis/ui/tools/error-list/icons/unit-test-error@2x.png b/basis/ui/tools/error-list/icons/unit-test-error@2x.png
new file mode 100644
index 0000000000..8c99a41654
Binary files /dev/null and b/basis/ui/tools/error-list/icons/unit-test-error@2x.png differ
diff --git a/basis/ui/tools/error-list/icons/unit-test-error@2x.tiff b/basis/ui/tools/error-list/icons/unit-test-error@2x.tiff
deleted file mode 100644
index 50287786d5..0000000000
Binary files a/basis/ui/tools/error-list/icons/unit-test-error@2x.tiff and /dev/null differ
diff --git a/basis/ui/tools/error-list/icons/user-init-error.png b/basis/ui/tools/error-list/icons/user-init-error.png
new file mode 100644
index 0000000000..261de8ab6f
Binary files /dev/null and b/basis/ui/tools/error-list/icons/user-init-error.png differ
diff --git a/basis/ui/tools/error-list/icons/user-init-error.tiff b/basis/ui/tools/error-list/icons/user-init-error.tiff
deleted file mode 100644
index b5abe0d872..0000000000
Binary files a/basis/ui/tools/error-list/icons/user-init-error.tiff and /dev/null differ
diff --git a/basis/ui/tools/error-list/icons/user-init-error@2x.png b/basis/ui/tools/error-list/icons/user-init-error@2x.png
new file mode 100644
index 0000000000..599fcf5bc6
Binary files /dev/null and b/basis/ui/tools/error-list/icons/user-init-error@2x.png differ
diff --git a/basis/ui/tools/error-list/icons/user-init-error@2x.tiff b/basis/ui/tools/error-list/icons/user-init-error@2x.tiff
deleted file mode 100644
index 8de93fdfe9..0000000000
Binary files a/basis/ui/tools/error-list/icons/user-init-error@2x.tiff and /dev/null differ