diff --git a/icons/timeline-panel.png b/icons/timeline-panel.png
new file mode 100644
index 000000000..91bf10a96
Binary files /dev/null and b/icons/timeline-panel.png differ
diff --git a/icons/timeline-panel.svg b/icons/timeline-panel.svg
new file mode 100644
index 000000000..f77c1c0a0
--- /dev/null
+++ b/icons/timeline-panel.svg
@@ -0,0 +1,415 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="16"
+   height="16"
+   id="svg2677"
+   sodipodi:version="0.32"
+   inkscape:version="0.46"
+   sodipodi:docname="timeline.svg"
+   version="1.0"
+   inkscape:output_extension="org.inkscape.output.svg.inkscape"
+   inkscape:export-filename="/home/joel/workspace/lumiera/lumiera/icons/timeline.png"
+   inkscape:export-xdpi="90"
+   inkscape:export-ydpi="90">
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     gridtolerance="10000"
+     guidetolerance="10"
+     objecttolerance="10"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="31.678384"
+     inkscape:cx="7.0051041"
+     inkscape:cy="8.0063517"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     inkscape:window-width="1263"
+     inkscape:window-height="839"
+     inkscape:window-x="6"
+     inkscape:window-y="46"
+     showguides="true"
+     inkscape:guide-bbox="true">
+    <inkscape:grid
+       type="xygrid"
+       id="grid3237"
+       visible="true"
+       enabled="true"
+       dotted="true"
+       originy="1px"
+       originx="1px"
+       spacingx="0.5px"
+       spacingy="0.5px"
+       empspacing="2"
+       empcolor="#ff00ff"
+       empopacity="0.25098039" />
+    <sodipodi:guide
+       orientation="1,0"
+       position="-4.7666573,8.4284603"
+       id="guide5650" />
+  </sodipodi:namedview>
+  <defs
+     id="defs2679">
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient5654">
+      <stop
+         style="stop-color:#000000;stop-opacity:1"
+         offset="0"
+         id="stop5656" />
+      <stop
+         id="stop5664"
+         offset="0.12824202"
+         style="stop-color:#ffffff;stop-opacity:1" />
+      <stop
+         id="stop5662"
+         offset="0.87204576"
+         style="stop-color:#ffffff;stop-opacity:1" />
+      <stop
+         style="stop-color:#000000;stop-opacity:1"
+         offset="1"
+         id="stop5658" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient5633">
+      <stop
+         style="stop-color:#2e3436;stop-opacity:1"
+         offset="0"
+         id="stop5635" />
+      <stop
+         style="stop-color:#555753;stop-opacity:1"
+         offset="1"
+         id="stop5637" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient5580">
+      <stop
+         style="stop-color:#ad7fa8;stop-opacity:1"
+         offset="0"
+         id="stop5582" />
+      <stop
+         style="stop-color:#5c3566;stop-opacity:1"
+         offset="1"
+         id="stop5584" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient5572">
+      <stop
+         style="stop-color:#888a85;stop-opacity:1"
+         offset="0"
+         id="stop5574" />
+      <stop
+         style="stop-color:#555753;stop-opacity:1"
+         offset="1"
+         id="stop5576" />
+    </linearGradient>
+    <inkscape:perspective
+       id="perspective2685"
+       inkscape:persp3d-origin="372.04724 : 350.78739 : 1"
+       inkscape:vp_z="744.09448 : 526.18109 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_x="0 : 526.18109 : 1"
+       sodipodi:type="inkscape:persp3d" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5572"
+       id="linearGradient5578"
+       x1="0"
+       y1="4.5"
+       x2="16"
+       y2="4.5"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(0,1)" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5580"
+       id="linearGradient5586"
+       x1="5"
+       y1="5"
+       x2="11"
+       y2="10"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(0,1)" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5580"
+       id="linearGradient5590"
+       gradientUnits="userSpaceOnUse"
+       x1="5"
+       y1="5"
+       x2="11"
+       y2="10"
+       gradientTransform="translate(7,1)" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5580"
+       id="linearGradient5594"
+       gradientUnits="userSpaceOnUse"
+       x1="5"
+       y1="5"
+       x2="11"
+       y2="10"
+       gradientTransform="translate(-7,1)" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5633"
+       id="linearGradient5639"
+       x1="16"
+       y1="2.5"
+       x2="0"
+       y2="2.5"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(0,1)" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5654"
+       id="linearGradient5660"
+       x1="0"
+       y1="9"
+       x2="16"
+       y2="9"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5654"
+       id="linearGradient5682"
+       gradientUnits="userSpaceOnUse"
+       x1="0"
+       y1="9"
+       x2="16"
+       y2="9" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5654"
+       id="linearGradient5685"
+       gradientUnits="userSpaceOnUse"
+       x1="0"
+       y1="9"
+       x2="16"
+       y2="9" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5580"
+       id="linearGradient5687"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(7,1)"
+       x1="5"
+       y1="5"
+       x2="11"
+       y2="9.5" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5572"
+       id="linearGradient5689"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(0,1)"
+       x1="0"
+       y1="4.5"
+       x2="16"
+       y2="4.5" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5580"
+       id="linearGradient5691"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(-7,1)"
+       x1="5"
+       y1="5"
+       x2="11"
+       y2="10" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5633"
+       id="linearGradient5693"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(0,1)"
+       x1="16"
+       y1="2.5"
+       x2="0"
+       y2="2.5" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5633"
+       id="linearGradient5696"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(0,1)"
+       x1="16"
+       y1="2.5"
+       x2="0"
+       y2="2.5" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5580"
+       id="linearGradient5699"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(-7,1)"
+       x1="5"
+       y1="5"
+       x2="11"
+       y2="10" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5580"
+       id="linearGradient5702"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(7,1)"
+       x1="5"
+       y1="5"
+       x2="11"
+       y2="9.5" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5572"
+       id="linearGradient5707"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,0.8888889,0,1.3333333)"
+       x1="0"
+       y1="4.5"
+       x2="16"
+       y2="4.5" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5580"
+       id="linearGradient5711"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(1,1)"
+       x1="5"
+       y1="5"
+       x2="11"
+       y2="9.5" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5580"
+       id="linearGradient5715"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(-5,1)"
+       x1="5"
+       y1="5"
+       x2="11"
+       y2="9.5" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5580"
+       id="linearGradient5734"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(1,1)"
+       x1="5"
+       y1="5"
+       x2="11"
+       y2="9.5" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5580"
+       id="linearGradient5738"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(-5,1)"
+       x1="5"
+       y1="5"
+       x2="11"
+       y2="9.5" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5654"
+       id="linearGradient5753"
+       gradientUnits="userSpaceOnUse"
+       x1="0"
+       y1="9"
+       x2="16"
+       y2="9" />
+    <mask
+       maskUnits="userSpaceOnUse"
+       id="mask5749">
+      <rect
+         y="0"
+         x="0"
+         height="16"
+         width="16"
+         id="rect5751"
+         style="fill:url(#linearGradient5753);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:round;stroke-miterlimit:4;stroke-dasharray:1, 1;stroke-dashoffset:0" />
+    </mask>
+  </defs>
+  <metadata
+     id="metadata2682">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     id="layer1"
+     inkscape:groupmode="layer"
+     inkscape:label="Layer 1">
+    <g
+       id="g5740"
+       mask="url(#mask5749)">
+      <rect
+         ry="0"
+         y="4"
+         x="0"
+         height="8"
+         width="16"
+         id="rect3249"
+         style="fill:url(#linearGradient5707);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:round;stroke-miterlimit:4;stroke-dasharray:none" />
+      <path
+         sodipodi:nodetypes="cc"
+         id="path4035"
+         d="M -1,5.5 L 16,5.5"
+         style="fill:none;fill-rule:evenodd;stroke:#eeeeec;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;marker-start:none;marker-mid:none;stroke-miterlimit:4;stroke-dasharray:1, 1;stroke-dashoffset:0;stroke-opacity:1" />
+      <path
+         inkscape:export-ydpi="90"
+         inkscape:export-xdpi="90"
+         sodipodi:nodetypes="cc"
+         style="fill:none;fill-rule:evenodd;stroke:#eeeeec;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;marker-start:none;marker-mid:none;stroke-miterlimit:4;stroke-dasharray:1, 1;stroke-dashoffset:0;stroke-opacity:1"
+         d="M -1,10.5 L 16,10.5"
+         id="path5564" />
+      <rect
+         style="fill:url(#linearGradient5702);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:round;stroke-miterlimit:4;stroke-dasharray:none"
+         id="rect5588"
+         width="5"
+         height="4"
+         x="12"
+         y="6"
+         ry="0" />
+      <path
+         sodipodi:nodetypes="cccccccccc"
+         d="M 0,3 L 0,4 L 16,4 L 16,3 L 0,3 z M 0,12 L 0,13 L 16,13 L 16,12 L 0,12 z"
+         style="fill:url(#linearGradient5696);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         id="path5616" />
+      <rect
+         ry="0"
+         y="6"
+         x="6"
+         height="4"
+         width="5"
+         id="rect5732"
+         style="fill:url(#linearGradient5734);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:round;stroke-miterlimit:4;stroke-dasharray:none" />
+      <rect
+         style="fill:url(#linearGradient5738);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:round;stroke-miterlimit:4;stroke-dasharray:none"
+         id="rect5736"
+         width="5"
+         height="4"
+         x="0"
+         y="6"
+         ry="0" />
+    </g>
+  </g>
+</svg>
diff --git a/src/gui/Makefile.am b/src/gui/Makefile.am
index ff02570bd..5ea08b2a8 100644
--- a/src/gui/Makefile.am
+++ b/src/gui/Makefile.am
@@ -72,7 +72,8 @@ lumigui_LDADD = $(GTK_LUMIERA_LIBS)
 
 lumigui_DEPENDENCIES =                                  \
     $(top_builddir)/lumiera_ui.rc                       \
-    $(top_builddir)/viewer-panel.png
+    $(top_builddir)/viewer-panel.png                    \
+    $(top_builddir)/timeline.png                        
 
 $(top_builddir)/lumiera_ui.rc:
 	cp $(lumigui_srcdir)/lumiera_ui.rc $(top_builddir)
@@ -80,3 +81,6 @@ $(top_builddir)/lumiera_ui.rc:
 $(top_builddir)/viewer-panel.png:
 	cp $(top_srcdir)/icons/viewer-panel.png $(top_builddir)
 
+$(top_builddir)/timeline.png:
+	cp $(top_srcdir)/icons/timeline.png $(top_builddir)
+
diff --git a/src/gui/panels/timeline-panel.cpp b/src/gui/panels/timeline-panel.cpp
index 7d1de24ea..06e6187e0 100644
--- a/src/gui/panels/timeline-panel.cpp
+++ b/src/gui/panels/timeline-panel.cpp
@@ -27,7 +27,7 @@ namespace gui {
 namespace panels {
 
 TimelinePanel::TimelinePanel() :
-  Panel("timeline", "Timeline")
+  Panel("timeline", "Timeline", "timeline_panel")
   {
     pack_start(timeline_widget);
   }
diff --git a/src/gui/workspace/actions.cpp b/src/gui/workspace/actions.cpp
index 389c0059a..73c3d7983 100644
--- a/src/gui/workspace/actions.cpp
+++ b/src/gui/workspace/actions.cpp
@@ -67,7 +67,7 @@ namespace workspace {
     actionGroup->add(Action::create("ViewMenu", _("_View")));
 	  actionGroup->add(Action::create("ViewViewer", Gtk::StockID("viewer_panel")),
 	    sigc::mem_fun(*this, &Actions::on_menu_view_viewer));
-	  actionGroup->add(Action::create("ViewTimeline", _("_Timeline")),
+	  actionGroup->add(Action::create("ViewTimeline", Gtk::StockID("timeline_panel")),
 	    sigc::mem_fun(*this, &Actions::on_menu_view_timeline));
 
 	  // Help Menu
@@ -81,6 +81,7 @@ namespace workspace {
   {
     RefPtr<IconFactory> factory = IconFactory::create();
     add_stock_item(factory, "viewer-panel.png", "viewer_panel", _("_Viewer"));
+    add_stock_item(factory, "timeline-panel.png", "timeline_panel", _("_Timeline"));
     factory->add_default(); //Add factory to list of factories.
   }