diff --git a/synfig-studio/images/Makefile.am b/synfig-studio/images/Makefile.am
index 9d0bc63..8cf0d1a 100644
--- a/synfig-studio/images/Makefile.am
+++ b/synfig-studio/images/Makefile.am
@@ -25,7 +25,7 @@ EXTRA_DIST = \
animate_mode_icons.sif \
clear_redo_icon.sif \
clear_undo_icon.sif \
- curves_icon.sif \
+ graphs_icon.sif \
duplicate_icon.sif \
encapsulate_icon.sif \
keyframe_lock_icons.sif \
@@ -159,7 +159,7 @@ EXTRA_DIST = \
\
canvas_icon.sif \
children_icon.sif \
- curves_icon.sif \
+ graphs_icon.sif \
group_icon.sif \
history_icon.sif \
info_icon.sif \
@@ -325,7 +325,7 @@ IMAGES = \
\
canvas_icon.$(EXT) \
children_icon.$(EXT) \
- curves_icon.$(EXT) \
+ graphs_icon.$(EXT) \
group_icon.$(EXT) \
history_icon.$(EXT) \
info_icon.$(EXT) \
diff --git a/synfig-studio/images/curves_icon.sif b/synfig-studio/images/curves_icon.sif
deleted file mode 100644
index c37af5d..0000000
--- a/synfig-studio/images/curves_icon.sif
+++ /dev/null
@@ -1,1638 +0,0 @@
-
-
diff --git a/synfig-studio/images/graphs_icon.sif b/synfig-studio/images/graphs_icon.sif
new file mode 100644
index 0000000..c37af5d
--- /dev/null
+++ b/synfig-studio/images/graphs_icon.sif
@@ -0,0 +1,1638 @@
+
+
+ Synfig Studio: Panel: Curves Icon
+ Placed in the Public Domain in 2010 by Yu Chen (jcome)
+
+
+
+
+
+
+
+
+ 0.097626
+ 0.016710
+ 0.000000
+ 1.000000
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 0.000000
+ 0.000000
+ 0.000000
+ 1.000000
+
+
+
+
+ 0.1000000015
+ -0.1000000015
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ -0.8000000119
+ 0.8000000119
+
+
+
+
+ -0.8000000119
+ -0.2000000030
+
+
+
+
+ 0.2000000030
+ -0.2000000030
+
+
+
+
+ 0.2000000030
+ 0.8000000119
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 0.2000000030
+ 0.2000000030
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 0.000000
+ 0.000000
+ 0.000000
+ 1.000000
+
+
+
+
+ 0.0000000000
+ 0.0000000000
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ -0.8000000119
+ 0.8000000119
+
+
+
+
+ -0.8000000119
+ -0.2000000030
+
+
+
+
+ 0.2000000030
+ -0.2000000030
+
+
+
+
+ 0.2000000030
+ 0.8000000119
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 1.000000
+ 0.900000
+ 0.600000
+ 1.000000
+
+
+
+
+ 0.0000000000
+ 0.0000000000
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ -0.6999999881
+ 0.6999999881
+
+
+
+
+ -0.6999999881
+ -0.1000000015
+
+
+
+
+ 0.1000000015
+ -0.1000000015
+
+
+
+
+ 0.1000000015
+ 0.6999999881
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 0.0000000000
+ 0.0000000000
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 0.023104
+ 0.030257
+ 0.032876
+ 1.000000
+
+
+
+
+ 0.0000000000
+ 0.0000000000
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 0.6036222577
+ -0.6444313526
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ -0.9990552664
+ -0.6442459226
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ -0.9990819097
+ -0.8387000561
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 0.6032685041
+ -0.8388854861
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 0.6101776361
+ -0.9750053287
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 0.9814813733
+ -0.7395626903
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 0.6102247238
+ -0.4963238835
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 0.023104
+ 0.030257
+ 0.032876
+ 1.000000
+
+
+
+
+ 0.0000000000
+ 0.0000000000
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ -0.8316677213
+ 0.6007110476
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ -0.8316677213
+ -0.9940878153
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ -0.6314664483
+ -0.9940878153
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ -0.6314664483
+ 0.6003839374
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ -0.4953473806
+ 0.6073029041
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ -0.7308279276
+ 0.9785835743
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ -0.9740288258
+ 0.6073029041
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 0.023104
+ 0.030257
+ 0.032876
+ 1.000000
+
+
+
+
+ 0.0000000000
+ 0.0000000000
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ -1.0364583731
+ -0.2031250000
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ -0.3697916567
+ 0.1093749925
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 0.3802083433
+ -0.2135416567
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 0.9010416865
+ 0.9089680910
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 0.0000000000
+ 0.0000000000
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 0.106156
+ 0.031551
+ 0.133209
+ 1.000000
+
+
+
+
+ 0.0000000000
+ 0.0000000000
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ -1.0364583731
+ -0.2031250000
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ -0.3697916567
+ 0.1093749925
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 0.3802083433
+ -0.2135416567
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 0.9010416865
+ 0.9089680910
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 0.0000000000
+ 0.0000000000
+
+
+
+
+
+
+
+
+
+
+
+ -1.0364583731
+ -0.2031250000
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ -0.3697916567
+ 0.1093749925
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 0.3802083433
+ -0.2135416567
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 0.9010416865
+ 0.9089680910
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 0.974300
+ 0.436813
+ 0.044553
+ 1.000000
+
+
+ 0.593691
+ 0.074502
+ 0.000000
+ 1.000000
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 0.023104
+ 0.030257
+ 0.032876
+ 1.000000
+
+
+
+
+ -0.9479166865
+ 0.9531250000
+
+
+
+
+ 0.9531250000
+ -0.9427083135
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 0.0000000000
+ 0.0000000000
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 0.0000000000
+ 0.0000000000
+
+
+
+
diff --git a/synfig-studio/src/gui/app.cpp b/synfig-studio/src/gui/app.cpp
index a20ece4..470e19f 100644
--- a/synfig-studio/src/gui/app.cpp
+++ b/synfig-studio/src/gui/app.cpp
@@ -1835,7 +1835,7 @@ App::reset_initial_window_configuration()
synfigapp::Main::settings().set_value("dock.dialog.1.size",v_size);
synfigapp::Main::settings().set_value("dock.dialog.1.pos",v_pos);
synfigapp::Main::settings().set_value("dock.dialog.2.comp_selector","0");
- synfigapp::Main::settings().set_value("dock.dialog.2.contents","parameters children keyframes | timetrack curves meta_data");
+ synfigapp::Main::settings().set_value("dock.dialog.2.contents","parameters children keyframes | timetrack graphs meta_data");
synfigapp::Main::settings().set_value("dock.dialog.2.contents_size",h_contents);
synfigapp::Main::settings().set_value("dock.dialog.2.size",h_size);
synfigapp::Main::settings().set_value("dock.dialog.2.pos",h_pos);
diff --git a/synfig-studio/src/gui/docks/dock_curves.cpp b/synfig-studio/src/gui/docks/dock_curves.cpp
index 2bd4ede..151a85a 100644
--- a/synfig-studio/src/gui/docks/dock_curves.cpp
+++ b/synfig-studio/src/gui/docks/dock_curves.cpp
@@ -66,7 +66,7 @@ using namespace studio;
/* === M E T H O D S ======================================================= */
Dock_Curves::Dock_Curves():
- Dock_CanvasSpecific("curves",_("Curves"),Gtk::StockID("synfig-curves"))
+ Dock_CanvasSpecific("graphs",_("Graphs"),Gtk::StockID("synfig-graphs"))
{
last_widget_curves_=0;
table_=0;
diff --git a/synfig-studio/src/gui/iconcontroller.cpp b/synfig-studio/src/gui/iconcontroller.cpp
index 1fd8c16..5a2639e 100644
--- a/synfig-studio/src/gui/iconcontroller.cpp
+++ b/synfig-studio/src/gui/iconcontroller.cpp
@@ -254,7 +254,7 @@ IconController::IconController(const synfig::String& /*basepath*/)
INIT_STOCK_ICON(clear_redo,"clear_redo_icon."IMAGE_EXT,_("Clear Redo Stack"));
INIT_STOCK_ICON(children,"children_icon."IMAGE_EXT,_("Children"));
- INIT_STOCK_ICON(curves,"curves_icon."IMAGE_EXT,_("Curves"));
+ INIT_STOCK_ICON(graphs,"graphs_icon."IMAGE_EXT,_("Graphs"));
INIT_STOCK_ICON(keyframes,"keyframe_icon."IMAGE_EXT,_("Keyframes"));
INIT_STOCK_ICON(meta_data,"meta_data_icon."IMAGE_EXT,_("MetaData"));
INIT_STOCK_ICON(navigator,"navigator_icon."IMAGE_EXT,_("Navigator"));