diff --git a/README.txt b/README.txt
index bffc3da206..cbe8d632ce 100644
--- a/README.txt
+++ b/README.txt
@@ -136,7 +136,6 @@ as, and issue a command similar to the following to bootstrap Factor:
     generic/ - generic words, for object oriented programming style
     help/ - online help system
     httpd/ - HTTP client, server, and web application framework
-    icons/ - images used by web framework and UI
     inference/ - stack effect inference, used by compiler, as well as a
       useful development tool of its own
     io/ - input and output streams
diff --git a/TODO.FACTOR.txt b/TODO.FACTOR.txt
index 6086711782..e02c592c52 100644
--- a/TODO.FACTOR.txt
+++ b/TODO.FACTOR.txt
@@ -12,7 +12,6 @@
 - theme abstraction in ui
 - menu dragging
 - find out why so many small bignums get consed
-- icons
 - use incremental strategy for all pack layouts where possible
 - multiline editing in listener
 - get stuff in examples dir running in the ui
@@ -39,6 +38,7 @@
 
 + ffi:
 
+- C structs, enums, unions: use new-style string mode parsing
 - alien/c-types.factor is ugly
 - smarter out parameter handling
 - clarify powerpc passing of value struct parameters
@@ -82,6 +82,17 @@
 - instances: do not use make-list
 - vectors: ensure its ok with bignum indices
 - code gc
+- set-path: iterative
+- parse-command-line: no unswons of cli args
+- >c/c>: vector stack
+- tag: move from kernel-internals to kernel
+- word: when bootstrapping, 'word' var is not cleared
+- search: slow
+- investigate if rehashing on startup is really necessary
+- vectorize >n, n>, (get)
+- mutable strings simplifying string operarations
+- 2each, find*, subset are ugly
+- map and 2map duplicate logic
 
 + i/o:
 
diff --git a/doc/handbook.tex b/doc/handbook.tex
index 7e0e249273..250b42439f 100644
--- a/doc/handbook.tex
+++ b/doc/handbook.tex
@@ -5377,10 +5377,8 @@ Static content may be served by setting the \verb|"doc-root"| variable to a dire
 "/var/www/" "doc-root" set
 \end{verbatim}
 
-If a directory holds an \verb|index.html| file, the file is served when the directory is requested, otherwise a directory listing is produced. The directory listing references icons sent via the resource responder. The icons are located in the Factor source tree, and the \verb|"resource-path"| variable may be set to the root of the source tree in order for the icons to be located:
-\begin{verbatim}
-"/home/slava/work/Factor/" "resource-path" set
-\end{verbatim}
+If a directory holds an \verb|index.html| file, the file is served when the directory is requested, otherwise a directory listing is produced.
+
 A facility for ad-hoc server-side scripting exists. If a file with the \verb|.factsp| filename extension is requested, the file is run with \verb|run-file| and any output it sends to the default stream is sent to the client (\ref{stdio}). These ``Factor server pages'' are slower and less powerful than responders, so it is recommended that responders be used instead.
 
 A different static site can be associated with each virtual host by setting the \verb|"doc-root"| variable in each virtual host (\ref{vhosts}).
diff --git a/library/help/tutorial.factor b/library/help/tutorial.factor
index c3c4dab42f..ec4dc12811 100644
--- a/library/help/tutorial.factor
+++ b/library/help/tutorial.factor
@@ -33,7 +33,7 @@ M: general-list tutorial-line
 
 : <page> ( list -- gadget )
     [ tutorial-line ] map
-    <pile> dup 1 over set-pack-fill [ add-gadgets ] keep
+    <pile> 1 over set-pack-fill [ add-gadgets ] keep
     empty-border ;
 
 : tutorial-pages
@@ -361,13 +361,15 @@ M: general-list tutorial-line
         ]
     ] ;
 
-: <tutorial> ( pages -- browser )
-    tutorial-pages [ <page> ] map <book>
+: tutorial-theme
     dup { 204 204 255 } background set-paint-prop
     dup << gradient f { 0 1 0 } { 204 204 255 } { 255 204 255 } >> interior set-paint-prop
     dup "Sans Serif" font set-paint-prop
-    dup 18 font-size set-paint-prop
-    <book-browser> ;
+    18 font-size set-paint-prop ;
+
+: <tutorial> ( pages -- browser )
+    tutorial-pages [ <page> ] map <book>
+    dup tutorial-theme <book-browser> ;
 
 : tutorial ( -- )
     <tutorial> gadget. ;
diff --git a/library/icons/File.png b/library/icons/File.png
deleted file mode 100644
index dd1124b58e..0000000000
Binary files a/library/icons/File.png and /dev/null differ
diff --git a/library/icons/Folder.png b/library/icons/Folder.png
deleted file mode 100644
index 2de866acb8..0000000000
Binary files a/library/icons/Folder.png and /dev/null differ