diff --git a/icons/tangent-arc.png b/icons/tangent-arc.png
new file mode 100644
index 00000000..0db8ac3a
Binary files /dev/null and b/icons/tangent-arc.png differ
diff --git a/icons/text.png b/icons/text.png
new file mode 100644
index 00000000..01eb0289
Binary files /dev/null and b/icons/text.png differ
diff --git a/solvespace.cpp b/solvespace.cpp
index 8f091bf6..f5f8e8f4 100644
--- a/solvespace.cpp
+++ b/solvespace.cpp
@@ -828,7 +828,7 @@ void SolveSpace::MenuHelp(int id) {
             break;
         
         case GraphicsWindow::MNU_ABOUT:
-            Message("This is SolveSpace version 1.6.\n\n"
+            Message("This is SolveSpace version 1.7.\n\n"
                 "For more information, see http://solvespace.com/\n\n"
                 "Built " __TIME__ " " __DATE__ ".\n\n"
                 "Copyright 2008-2010 Useful Subset, LLC.\n"
diff --git a/toolbar.cpp b/toolbar.cpp
index 77ddcae7..d4d47a62 100644
--- a/toolbar.cpp
+++ b/toolbar.cpp
@@ -11,6 +11,8 @@ static const struct {
     { Icon_rectangle,       GraphicsWindow::MNU_RECTANGLE,      "Sketch rectangle"                                  },
     { Icon_circle,          GraphicsWindow::MNU_CIRCLE,         "Sketch circle"                                     },
     { Icon_arc,             GraphicsWindow::MNU_ARC,            "Sketch arc, or tangent arc at selected point"      },
+    { Icon_text,            GraphicsWindow::MNU_TTF_TEXT,       "Sketch curves from text in a TrueType font"        },
+    { Icon_tangent_arc,     GraphicsWindow::MNU_TANGENT_ARC,    "Create tangent arc at selected point"              },
     { Icon_bezier,          GraphicsWindow::MNU_CUBIC,          "Sketch cubic Bezier spline"                        },
     { Icon_point,           GraphicsWindow::MNU_DATUM_POINT,    "Sketch datum point"                                },
     { Icon_construction,    GraphicsWindow::MNU_CONSTRUCTION,   "Toggle construction"                               },
@@ -100,7 +102,7 @@ bool GraphicsWindow::ToolbarDrawOrHitTest(int mx, int my,
     int x = 17, y = (int)(height - 52);
 
     int fudge = 8;
-    int h = 32*14 + 3*16 + fudge;
+    int h = 32*15 + 3*16 + fudge;
     int aleft = 0, aright = 66, atop = y+16+fudge/2, abot = y+16-h;
 
     bool withinToolbar =