diff --git a/Icons/SVG/topology_edgeFlip.svg b/Icons/SVG/topology_edgeFlip.svg
new file mode 100644
index 0000000000000000000000000000000000000000..0aed37b232a36818cc42423840aa6f388a46c685
--- /dev/null
+++ b/Icons/SVG/topology_edgeFlip.svg
@@ -0,0 +1,112 @@
+<?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"
+   id="svg3778"
+   sodipodi:version="0.32"
+   inkscape:version="0.46"
+   width="48"
+   height="48"
+   version="1.0"
+   sodipodi:docname="topology_edgeFlip.svg"
+   inkscape:export-filename="/data/home2/wilden/projects/OpenFlipper/OpenFlipper-Free/OpenFlipper/Icons/topology-edgeFlip.png"
+   inkscape:export-xdpi="90"
+   inkscape:export-ydpi="90"
+   inkscape:output_extension="org.inkscape.output.svg.inkscape">
+  <metadata
+     id="metadata3783">
+    <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>
+  <defs
+     id="defs3781">
+    <marker
+       inkscape:stockid="Arrow2Lstart"
+       orient="auto"
+       refY="0.0"
+       refX="0.0"
+       id="Arrow2Lstart"
+       style="overflow:visible">
+      <path
+         id="path4324"
+         style="font-size:12.0;fill-rule:evenodd;stroke-width:0.62500000;stroke-linejoin:round"
+         d="M 8.7185878,4.0337352 L -2.2072895,0.016013256 L 8.7185884,-4.0017078 C 6.9730900,-1.6296469 6.9831476,1.6157441 8.7185878,4.0337352 z "
+         transform="scale(1.1) translate(1,0)" />
+    </marker>
+    <marker
+       inkscape:stockid="Arrow1Lstart"
+       orient="auto"
+       refY="0.0"
+       refX="0.0"
+       id="Arrow1Lstart"
+       style="overflow:visible">
+      <path
+         id="path4306"
+         d="M 0.0,0.0 L 5.0,-5.0 L -12.5,0.0 L 5.0,5.0 L 0.0,0.0 z "
+         style="fill-rule:evenodd;stroke:#000000;stroke-width:1.0pt;marker-start:none"
+         transform="scale(0.8) translate(12.5,0)" />
+    </marker>
+    <inkscape:perspective
+       sodipodi:type="inkscape:persp3d"
+       inkscape:vp_x="0 : 526.18109 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_z="744.09448 : 526.18109 : 1"
+       inkscape:persp3d-origin="372.04724 : 350.78739 : 1"
+       id="perspective3785" />
+  </defs>
+  <sodipodi:namedview
+     inkscape:window-height="804"
+     inkscape:window-width="1058"
+     inkscape:pageshadow="2"
+     inkscape:pageopacity="0.0"
+     guidetolerance="10.0"
+     gridtolerance="10.0"
+     objecttolerance="10.0"
+     borderopacity="1.0"
+     bordercolor="#666666"
+     pagecolor="#ffffff"
+     id="base"
+     showgrid="false"
+     inkscape:zoom="9.7083333"
+     inkscape:cx="24"
+     inkscape:cy="24"
+     inkscape:window-x="385"
+     inkscape:window-y="179"
+     inkscape:current-layer="svg3778" />
+  <image
+     xlink:href="/data/home2/wilden/icons/edgeFlip.png"
+     sodipodi:absref="/data/home2/wilden/icons/edgeFlip.png"
+     width="48"
+     height="48"
+     id="image3787"
+     x="0"
+     y="0" />
+  <path
+     style="opacity:0.88412014999999999;fill:none;fill-opacity:0.55066079999999995;stroke:#000000;stroke-width:3;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:0.76651983999999984;marker-start:none;stroke-dasharray:none"
+     d="M 23.8324,40.402212 C 21.192311,40.670173 18.531889,39.2247 16.550332,38.02831 C 14.568775,36.83192 12.854066,35.266588 11.487374,33.440754 C 10.120682,31.614919 9.1020089,29.528583 8.5125247,27.290185 C 7.9230402,25.051788 7.7627449,22.661329 8.1128097,20.227248 C 8.4628744,17.793167 9.2903218,15.544763 10.486712,13.563206 M 27.566744,5.1256835 C 29.691812,5.0637311 32.970259,6.3031958 34.951816,7.4995856 C 36.933373,8.6959751 38.648082,10.261307 40.014774,12.087142 C 41.381465,13.912977 42.400138,15.999313 42.989623,18.237711 C 43.579107,20.476108 43.739403,22.866567 43.389338,25.300648 C 43.039273,27.734729 42.211826,29.983133 41.015436,31.96469"
+     id="path3791"
+     sodipodi:nodetypes="cssssscssscs" />
+  <path
+     style="opacity:0.82403433;fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+     d="M 14.577251,5.9790158 L 27.805938,11.120003 L 27.676413,0.099091004 L 14.577251,5.9790158 z"
+     id="path6646"
+     sodipodi:nodetypes="cccc" />
+  <path
+     style="opacity:0.82403433;fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+     d="M 37.00811,40.390732 L 23.921216,34.898817 L 23.756813,45.919264 L 37.00811,40.390732 z"
+     id="path6650"
+     sodipodi:nodetypes="cccc" />
+</svg>
diff --git a/Icons/SVG/viewerSnapshot.svg b/Icons/SVG/viewerSnapshot.svg
new file mode 100644
index 0000000000000000000000000000000000000000..ffb118179ba533c1e100250097bcbbaf3046785f
--- /dev/null
+++ b/Icons/SVG/viewerSnapshot.svg
@@ -0,0 +1,188 @@
+<?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="48px"
+   height="48px"
+   id="svg2383"
+   sodipodi:version="0.32"
+   inkscape:version="0.46"
+   sodipodi:docname="viewerSnapshot.svg"
+   inkscape:output_extension="org.inkscape.output.svg.inkscape"
+   inkscape:export-filename="/data/home2/wilden/projects/OpenFlipper/OpenFlipper-Free/OpenFlipper/Icons/viewerSnapshot.png"
+   inkscape:export-xdpi="90"
+   inkscape:export-ydpi="90">
+  <defs
+     id="defs2385">
+    <linearGradient
+       id="linearGradient3199">
+      <stop
+         style="stop-color:#3672d7;stop-opacity:1;"
+         offset="0"
+         id="stop3201" />
+      <stop
+         style="stop-color:#ffffff;stop-opacity:1;"
+         offset="1"
+         id="stop3203" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient3183">
+      <stop
+         style="stop-color:#25a3de;stop-opacity:1;"
+         offset="0"
+         id="stop3185" />
+      <stop
+         style="stop-color:#fcffff;stop-opacity:1;"
+         offset="1"
+         id="stop3187" />
+    </linearGradient>
+    <inkscape:perspective
+       sodipodi:type="inkscape:persp3d"
+       inkscape:vp_x="0 : 24 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_z="48 : 24 : 1"
+       inkscape:persp3d-origin="24 : 16 : 1"
+       id="perspective2391" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3183"
+       id="linearGradient3189"
+       x1="24.571428"
+       y1="23.857143"
+       x2="41.142857"
+       y2="10.428572"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3183"
+       id="linearGradient3197"
+       x1="3.1428571"
+       y1="44.857143"
+       x2="22.714287"
+       y2="26.285715"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3199"
+       id="linearGradient3205"
+       x1="24.142857"
+       y1="44.857143"
+       x2="44.142857"
+       y2="25"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3199"
+       id="linearGradient3213"
+       x1="3.5714285"
+       y1="23.571428"
+       x2="23.000002"
+       y2="4.5714288"
+       gradientUnits="userSpaceOnUse" />
+    <filter
+       inkscape:collect="always"
+       id="filter3663">
+      <feGaussianBlur
+         inkscape:collect="always"
+         stdDeviation="0.44"
+         id="feGaussianBlur3665" />
+    </filter>
+    <filter
+       inkscape:collect="always"
+       id="filter3667">
+      <feGaussianBlur
+         inkscape:collect="always"
+         stdDeviation="0.44"
+         id="feGaussianBlur3669" />
+    </filter>
+    <filter
+       inkscape:collect="always"
+       id="filter3671">
+      <feGaussianBlur
+         inkscape:collect="always"
+         stdDeviation="0.44"
+         id="feGaussianBlur3673" />
+    </filter>
+    <filter
+       inkscape:collect="always"
+       id="filter3675">
+      <feGaussianBlur
+         inkscape:collect="always"
+         stdDeviation="0.44"
+         id="feGaussianBlur3677" />
+    </filter>
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="7"
+     inkscape:cx="12.231806"
+     inkscape:cy="24"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     inkscape:grid-bbox="true"
+     inkscape:document-units="px"
+     inkscape:window-width="1265"
+     inkscape:window-height="1023"
+     inkscape:window-x="89"
+     inkscape:window-y="27" />
+  <metadata
+     id="metadata2388">
+    <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:label="Layer 1"
+     inkscape:groupmode="layer">
+    <rect
+       style="opacity:0.88412014999999999;fill:url(#linearGradient3197);fill-opacity:1;stroke:#262626;stroke-width:0.76272488000000005;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;filter:url(#filter3675)"
+       id="rect2393"
+       width="21.237276"
+       height="21.237274"
+       x="2.3813624"
+       y="24.381363"
+       ry="0" />
+    <rect
+       style="opacity:0.88412014999999999;fill:url(#linearGradient3205);fill-opacity:1;stroke:#262626;stroke-width:0.76272488000000005;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;filter:url(#filter3667)"
+       id="rect3165"
+       width="21.237276"
+       height="21.237274"
+       x="23.381363"
+       y="24.381363"
+       ry="0" />
+    <rect
+       style="opacity:0.88412014999999999;fill:url(#linearGradient3213);fill-opacity:1;stroke:#262626;stroke-width:0.76272488000000005;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;filter:url(#filter3663)"
+       id="rect3167"
+       width="21.237276"
+       height="21.237274"
+       x="2.3813624"
+       y="3.3813634"
+       ry="0" />
+    <rect
+       style="opacity:0.88412014999999999;fill:url(#linearGradient3189);fill-opacity:1.0;stroke:#262626;stroke-width:0.76272488000000005;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;filter:url(#filter3671)"
+       id="rect3169"
+       width="21.237276"
+       height="21.237274"
+       x="23.381363"
+       y="3.3813634"
+       ry="0" />
+  </g>
+</svg>
diff --git a/Icons/blender/topology/flip_edge.blend b/Icons/blender/topology/flip_edge.blend
new file mode 100644
index 0000000000000000000000000000000000000000..7ed7d10a3be836479a5f865394a727f3b0554dc8
Binary files /dev/null and b/Icons/blender/topology/flip_edge.blend differ
diff --git a/Icons/selection_lasso2.png b/Icons/selection_lasso2.png
new file mode 100644
index 0000000000000000000000000000000000000000..02f4a5c1151f72c5600ade052d38885d08c4727a
Binary files /dev/null and b/Icons/selection_lasso2.png differ
diff --git a/Icons/topology-edgeFlip.png b/Icons/topology-edgeFlip.png
new file mode 100644
index 0000000000000000000000000000000000000000..af90cc41da3761e456c6cc2fd67c4f20b4f977b6
Binary files /dev/null and b/Icons/topology-edgeFlip.png differ
diff --git a/Icons/viewerSnapshot.png b/Icons/viewerSnapshot.png
new file mode 100644
index 0000000000000000000000000000000000000000..4db866f2ba72ceb68cc90c6e72a5d681f9a594ac
Binary files /dev/null and b/Icons/viewerSnapshot.png differ
diff --git a/widgets/coreWidget/MenuBar.cc b/widgets/coreWidget/MenuBar.cc
index d4fc42725dcf08e77851efcadbeb4cb783a39fd8..9b812885a363780d97b5c8e8ab289f22aa9c2392 100644
--- a/widgets/coreWidget/MenuBar.cc
+++ b/widgets/coreWidget/MenuBar.cc
@@ -317,6 +317,7 @@ void CoreWidget::setupMenuBar()
   connect( viewAllAction,SIGNAL( triggered() ), this, SLOT( slotGlobalViewAll() ) );
   viewMenu_->addAction( viewAllAction);
 
+  viewMenu_->addSeparator();
 
   QAction* snapShotAction = new QAction( "Viewer Snapshot", viewMenu_ );
   snapShotAction->setIcon( QIcon(OpenFlipper::Options::iconDirStr()+OpenFlipper::Options::dirSeparator()+"viewerSnapshot.png") );
@@ -327,7 +328,7 @@ void CoreWidget::setupMenuBar()
   connect( snapShotAction,SIGNAL( triggered() ), this, SLOT( viewerSnapshotDialog() ) );
   viewMenu_->addAction( snapShotAction);
 
-  QAction* appSnapShotAction = new QAction( "Snapshot", viewMenu_ );
+  QAction* appSnapShotAction = new QAction( "Application Snapshot", viewMenu_ );
   appSnapShotAction->setIcon( QIcon(OpenFlipper::Options::iconDirStr()+OpenFlipper::Options::dirSeparator()+"snapshot.png") );
   appSnapShotAction->setCheckable( false );
   appSnapShotAction->setToolTip("Take a snapshot from OpenFlipper.");