diff --git a/images/themes/default/mActionAllEdits.svg b/images/themes/default/mActionAllEdits.svg
diff --git a/images/themes/default/mActionCancelAllEdits.svg b/images/themes/default/mActionCancelAllEdits.svg
diff --git a/images/themes/default/mActionCancelEdits.svg b/images/themes/default/mActionCancelEdits.svg
diff --git a/images/themes/default/mActionRollbackAllEdits.svg b/images/themes/default/mActionRollbackAllEdits.svg
diff --git a/images/themes/default/mActionRollbackEdits.svg b/images/themes/default/mActionRollbackEdits.svg
diff --git a/images/themes/default/mActionSaveAllEdits.png b/images/themes/default/mActionSaveAllEdits.png
diff --git a/images/themes/default/mActionSaveAllEdits.svg b/images/themes/default/mActionSaveAllEdits.svg
diff --git a/images/themes/default/mActionSaveEdits.svg b/images/themes/default/mActionSaveEdits.svg
diff --git a/images/themes/default/mActionToggleEditing.svg b/images/themes/default/mActionToggleEditing.svg
diff --git a/images/themes/default/mIconEditableEdits.png b/images/themes/default/mIconEditableEdits.png
diff --git a/images/themes/gis/mActionAllEdits.svg b/images/themes/gis/mActionAllEdits.svg
diff --git a/images/themes/gis/mActionCancelAllEdits.svg b/images/themes/gis/mActionCancelAllEdits.svg
diff --git a/images/themes/gis/mActionCancelEdits.svg b/images/themes/gis/mActionCancelEdits.svg
diff --git a/images/themes/gis/mActionRollbackAllEdits.svg b/images/themes/gis/mActionRollbackAllEdits.svg
diff --git a/images/themes/gis/mActionRollbackEdits.svg b/images/themes/gis/mActionRollbackEdits.svg
diff --git a/images/themes/gis/mActionSaveAllEdits.png b/images/themes/gis/mActionSaveAllEdits.png
diff --git a/images/themes/gis/mActionSaveAllEdits.svg b/images/themes/gis/mActionSaveAllEdits.svg
diff --git a/images/themes/gis/mActionSaveEdits.png b/images/themes/gis/mActionSaveEdits.png
diff --git a/images/themes/gis/mActionSaveEdits.svg b/images/themes/gis/mActionSaveEdits.svg
diff --git a/images/themes/gis/mActionToggleEditing.svg b/images/themes/gis/mActionToggleEditing.svg
diff --git a/images/themes/gis/mIconEditableEdits.png b/images/themes/gis/mIconEditableEdits.png
diff --git a/python/gui/qgisinterface.sip b/python/gui/qgisinterface.sip
@@ -344,9 +344,19 @@ class QgisInterface : QObject
     virtual QAction *actionOpenTable() = 0;
     virtual QAction *actionToggleEditing() = 0;
     /** @note added in 1.9 */
+    virtual QAction *actionAllEdits() = 0;
+    /** @note added in 1.9 */
     virtual QAction *actionSaveEdits() = 0;
     /** @note added in 1.9 */
     virtual QAction *actionSaveAllEdits() = 0;
+    /** @note added in 1.9 */
+    virtual QAction *actionRollbackEdits() = 0;
+    /** @note added in 1.9 */
+    virtual QAction *actionRollbackAllEdits() = 0;
+    /** @note added in 1.9 */
+    virtual QAction *actionCancelEdits() = 0;
+    /** @note added in 1.9 */
+    virtual QAction *actionCancelAllEdits() = 0;
     virtual QAction *actionLayerSaveAs() = 0;
     virtual QAction *actionLayerSelectionSaveAs() = 0;
     virtual QAction *actionRemoveLayer() = 0;
@@ -380,6 +390,12 @@ class QgisInterface : QObject
     // @added in 1.6
     virtual bool openFeatureForm( QgsVectorLayer *l, QgsFeature &f, bool updateFeatureOnly = false ) = 0;
 
+    /** Return vector layers in edit mode
+     * @param modified whether to return only layers that have been modified
+     * @returns list of layers in legend order, or empty list
+     * @note added in 1.9 */
+    virtual QList<QgsMapLayer *> editableLayers( bool modified = false ) const = 0;
+
   signals:
     /** Emited whenever current (selected) layer changes.
      *  The pointer to layer can be null if no layer is selected

diff --git a/src/app/legend/qgslegend.cpp b/src/app/legend/qgslegend.cpp
@@ -1124,6 +1124,25 @@ QList<QgsMapLayer *> QgsLegend::selectedLayers( bool inDrawOrder )
   return layers;
 }
 
+bool QgsLegend::selectedLayersEditable( bool modified )
+{
+  bool hasEditable = false;
+  foreach ( QgsMapLayer * layer, selectedLayers() )
+  {
+    QgsVectorLayer *vl = qobject_cast<QgsVectorLayer*>( layer );
+    if ( !vl )
+    {
+      continue;
+    }
+    if ( vl->isEditable() && ( !modified || ( modified && vl->isModified() ) ) )
+    {
+      hasEditable = true;
+      break;
+    }
+  }
+  return hasEditable;
+}
+
 QList<QgsLegendLayer *> QgsLegend::legendLayers()
 {
   if ( mUpdateDrawingOrder )

diff --git a/src/app/legend/qgslegend.h b/src/app/legend/qgslegend.h
@@ -122,6 +122,11 @@ class QgsLegend : public QTreeWidget
       * @returns list of layers, else an empty list */
     QList<QgsMapLayer *> selectedLayers( bool inDrawOrder = false );
 
+    /** Returns true if layer selection has any editable vector layers
+     * @param modified return true of any of layers is also modified
+     * @note added in 1.9 */
+    bool selectedLayersEditable( bool modified = false );
+
     /*!Returns all layers loaded in QgsMapCanvas in drawing order
     Else, an empty list is returned.*/
     QList<QgsMapLayer *> layers();

diff --git a/src/app/legend/qgslegendlayer.cpp b/src/app/legend/qgslegendlayer.cpp
@@ -415,6 +415,7 @@ void QgsLegendLayer::addToPopupMenu( QMenu& theMenu )
 {
   QgsMapLayer *lyr = layer();
   QAction *toggleEditingAction = QgisApp::instance()->actionToggleEditing();
+  QAction *allEditsAction = QgisApp::instance()->actionAllEdits();
 
   // zoom to layer extent
   theMenu.addAction( QgsApplication::getThemeIcon( "/mActionZoomToLayer.png" ),
@@ -470,6 +471,11 @@ void QgsLegendLayer::addToPopupMenu( QMenu& theMenu )
       }
     }
 
+    if ( allEditsAction->isEnabled() )
+    {
+      theMenu.addAction( allEditsAction );
+    }
+
     // disable duplication of memory layers
     if ( vlayer->storageType() == "Memory storage" && legend()->selectedLayers().count() == 1 )
     {
@@ -608,11 +614,9 @@ void QgsLegendLayer::updateAfterLayerModification()
 {
   updateAfterLayerModification( false );
 }
+
 void QgsLegendLayer::updateAfterLayerModification( bool onlyGeomChanged )
 {
-  QgisApp::instance()->actionSaveAllEdits()->setEnabled(
-    QgisApp::instance()->unsavedEditableLayers().count() > 0 );
-
   if ( onlyGeomChanged )
   {
     updateIcon();

diff --git a/src/app/qgisapp.cpp b/src/app/qgisapp.cpp
diff --git a/src/app/qgisapp.h b/src/app/qgisapp.h
@@ -290,9 +290,19 @@ class QgisApp : public QMainWindow, private Ui::MainWindow
     QAction *actionPasteLayerStyle() { return mActionPasteStyle; }
     QAction *actionOpenTable() { return mActionOpenTable; }
     QAction *actionToggleEditing() { return mActionToggleEditing; }
+    /** @note added in 1.9 */
+    QAction *actionAllEdits() { return mActionAllEdits; }
     QAction *actionSaveEdits() { return mActionSaveEdits; }
     /** @note added in 1.9 */
     QAction *actionSaveAllEdits() { return mActionSaveAllEdits; }
+    /** @note added in 1.9 */
+    QAction *actionRollbackEdits() { return mActionRollbackEdits; }
+    /** @note added in 1.9 */
+    QAction *actionRollbackAllEdits() { return mActionRollbackAllEdits; }
+    /** @note added in 1.9 */
+    QAction *actionCancelEdits() { return mActionCancelEdits; }
+    /** @note added in 1.9 */
+    QAction *actionCancelAllEdits() { return mActionCancelAllEdits; }
     QAction *actionLayerSaveAs() { return mActionLayerSaveAs; }
     QAction *actionLayerSelectionSaveAs() { return mActionLayerSelectionSaveAs; }
     QAction *actionRemoveLayer() { return mActionRemoveLayer; }
@@ -379,10 +389,11 @@ class QgisApp : public QMainWindow, private Ui::MainWindow
     //! returns pointer to map legend
     QgsLegend *legend();
 
-    /** Return vector layers with unsaved provider edits
+    /** Return vector layers in edit mode
+     * @param modified whether to return only layers that have been modified
      * @returns list of layers in legend order, or empty list
      * @note added in 1.9 */
-    QList<QgsMapLayer *> unsavedEditableLayers() const;
+    QList<QgsMapLayer *> editableLayers( bool modified = false ) const;
 
 #ifdef Q_OS_WIN
     //! ugly hack
@@ -778,19 +789,57 @@ class QgisApp : public QMainWindow, private Ui::MainWindow
     //! starts/stops editing mode of the current layer
     void toggleEditing();
 
-    //! save current edits and start new transaction
+    //! starts/stops editing mode of a layer
+    bool toggleEditing( QgsMapLayer *layer, bool allowCancel = true );
+
+    //! Save edits of a layer
+    void saveEdits( QgsMapLayer *layer, bool leaveEditable = true );
+
+    /** Cancel edits for a layer
+      * @note added in 1.9 */
+    void cancelEdits( QgsMapLayer *layer, bool leaveEditable = true );
+
+    //! Save current edits for selected layer(s) and start new transaction(s)
     void saveEdits();
 
-    /** Save all edits and start new transactions
+    /** Save edits for all layers and start new transactions
+     * @note added in 1.9 */
+    void saveAllEdits( bool verifyAction = true );
+
+    /** Rollback current edits for selected layer(s) and start new transaction(s)
+      * @note added in 1.9 */
+    void rollbackEdits();
+
+    /** Rollback edits for all layers and start new transactions
      * @note added in 1.9 */
-    void saveAllEdits();
+    void rollbackAllEdits( bool verifyAction = true );
+
+    /** Cancel edits for selected layer(s) and toggle off editing
+      * @note added in 1.9 */
+    void cancelEdits();
+
+    /** Cancel all edits for all layers and toggle off editing
+     * @note added in 1.9 */
+    void cancelAllEdits( bool verifyAction = true );
+
+    /** Dialog for verification of action on many edits
+     * @note added in 1.9 */
+    bool verifyEditsActionDialog( QString act, QString upon );
+
+    /** Update gui actions/menus when layers are modified
+     * @note added in 1.9 */
+    void updateLayerModifiedActions();
 
     //! change layer subset of current vector layer
     void layerSubsetString();
 
     //! map tool changed
     void mapToolChanged( QgsMapTool *tool );
 
+    /** Called when some layer's editing mode was toggled on/off
+     * @note added in 1.9 */
+    void layerEditStateChanged();
+
     /** Activates or deactivates actions depending on the current maplayer type.
     Is called from the legend when the current legend item has changed*/
     void activateDeactivateLayerRelatedActions( QgsMapLayer* layer );
@@ -851,12 +900,6 @@ class QgisApp : public QMainWindow, private Ui::MainWindow
     //! shows label settings dialog (for labeling-ng)
     void labeling();
 
-    //! starts/stops editing mode of a layer
-    bool toggleEditing( QgsMapLayer *layer, bool allowCancel = true );
-
-    //! save edits of a layer
-    void saveEdits( QgsMapLayer *layer );
-
     //! save current vector layer
     void saveAsFile();
     void saveSelectionAsVectorFile();

diff --git a/src/app/qgisappinterface.cpp b/src/app/qgisappinterface.cpp
@@ -436,8 +436,13 @@ QAction *QgisAppInterface::actionCopyLayerStyle() { return qgis->actionCopyLayer
 QAction *QgisAppInterface::actionPasteLayerStyle() { return qgis->actionPasteLayerStyle(); }
 QAction *QgisAppInterface::actionOpenTable() { return qgis->actionOpenTable(); }
 QAction *QgisAppInterface::actionToggleEditing() { return qgis->actionToggleEditing(); }
+QAction *QgisAppInterface::actionAllEdits() { return qgis->actionAllEdits(); }
 QAction *QgisAppInterface::actionSaveEdits() { return qgis->actionSaveEdits(); }
 QAction *QgisAppInterface::actionSaveAllEdits() { return qgis->actionSaveAllEdits(); }
+QAction *QgisAppInterface::actionRollbackEdits() { return qgis->actionRollbackEdits(); }
+QAction *QgisAppInterface::actionRollbackAllEdits() { return qgis->actionRollbackAllEdits(); }
+QAction *QgisAppInterface::actionCancelEdits() { return qgis->actionCancelEdits(); }
+QAction *QgisAppInterface::actionCancelAllEdits() { return qgis->actionCancelAllEdits(); }
 QAction *QgisAppInterface::actionLayerSaveAs() { return qgis->actionLayerSaveAs(); }
 QAction *QgisAppInterface::actionLayerSelectionSaveAs() { return qgis->actionLayerSelectionSaveAs(); }
 QAction *QgisAppInterface::actionRemoveLayer() { return qgis->actionRemoveLayer(); }
@@ -474,3 +479,8 @@ bool QgisAppInterface::openFeatureForm( QgsVectorLayer *vlayer, QgsFeature &f, b
   QgsFeatureAction action( tr( "Attributes changed" ), f, vlayer, -1, -1, QgisApp::instance() );
   return action.editFeature();
 }
+
+QList<QgsMapLayer *> QgisAppInterface::editableLayers( bool modified ) const
+{
+  return qgis->editableLayers( modified );
+}
diff --git a/src/app/qgisappinterface.h b/src/app/qgisappinterface.h
@@ -296,9 +296,19 @@ class QgisAppInterface : public QgisInterface
     virtual QAction *actionOpenTable();
     virtual QAction *actionToggleEditing();
     /** @note added in 1.9 */
+    virtual QAction *actionAllEdits();
+    /** @note added in 1.9 */
     virtual QAction *actionSaveEdits();
     /** @note added in 1.9 */
     virtual QAction *actionSaveAllEdits();
+    /** @note added in 1.9 */
+    virtual QAction *actionRollbackEdits();
+    /** @note added in 1.9 */
+    virtual QAction *actionRollbackAllEdits();
+    /** @note added in 1.9 */
+    virtual QAction *actionCancelEdits();
+    /** @note added in 1.9 */
+    virtual QAction *actionCancelAllEdits();
     virtual QAction *actionLayerSaveAs();
     virtual QAction *actionLayerSelectionSaveAs();
     virtual QAction *actionRemoveLayer();
@@ -335,6 +345,12 @@ class QgisAppInterface : public QgisInterface
     // @added in 1.6
     virtual bool openFeatureForm( QgsVectorLayer *l, QgsFeature &f, bool updateFeatureOnly = false );
 
+    /** Return vector layers in edit mode
+     * @param modified whether to return only layers that have been modified
+     * @returns list of layers in legend order, or empty list
+     * @note added in 1.9 */
+    virtual QList<QgsMapLayer *> editableLayers( bool modified = false ) const;
+
   signals:
     void currentThemeChanged( QString );
 

diff --git a/src/gui/qgisinterface.h b/src/gui/qgisinterface.h
@@ -392,9 +392,19 @@ class GUI_EXPORT QgisInterface : public QObject
     virtual QAction *actionOpenTable() = 0;
     virtual QAction *actionToggleEditing() = 0;
     /** @note added in 1.9 */
+    virtual QAction *actionAllEdits() = 0;
+    /** @note added in 1.9 */
     virtual QAction *actionSaveEdits() = 0;
     /** @note added in 1.9 */
     virtual QAction *actionSaveAllEdits() = 0;
+    /** @note added in 1.9 */
+    virtual QAction *actionRollbackEdits() = 0;
+    /** @note added in 1.9 */
+    virtual QAction *actionRollbackAllEdits() = 0;
+    /** @note added in 1.9 */
+    virtual QAction *actionCancelEdits() = 0;
+    /** @note added in 1.9 */
+    virtual QAction *actionCancelAllEdits() = 0;
     virtual QAction *actionLayerSaveAs() = 0;
     virtual QAction *actionLayerSelectionSaveAs() = 0;
     virtual QAction *actionRemoveLayer() = 0;
@@ -428,6 +438,12 @@ class GUI_EXPORT QgisInterface : public QObject
     // @added in 1.6
     virtual bool openFeatureForm( QgsVectorLayer *l, QgsFeature &f, bool updateFeatureOnly = false ) = 0;
 
+    /** Return vector layers in edit mode
+     * @param modified whether to return only layers that have been modified
+     * @returns list of layers in legend order, or empty list
+     * @note added in 1.9 */
+    virtual QList<QgsMapLayer *> editableLayers( bool modified = false ) const = 0;
+
   signals:
     /** Emited whenever current (selected) layer changes.
      *  The pointer to layer can be null if no layer is selected

diff --git a/src/ui/qgisapp.ui b/src/ui/qgisapp.ui
@@ -164,8 +164,7 @@
     <addaction name="separator"/>
     <addaction name="mActionOpenTable"/>
     <addaction name="mActionToggleEditing"/>
-    <addaction name="mActionSaveEdits"/>
-    <addaction name="mActionSaveAllEdits"/>
+    <addaction name="mActionAllEdits"/>
     <addaction name="separator"/>
     <addaction name="mActionLayerSaveAs"/>
     <addaction name="mActionLayerSelectionSaveAs"/>
@@ -281,9 +280,8 @@
    <attribute name="toolBarBreak">
     <bool>true</bool>
    </attribute>
-   <addaction name="mActionSaveAllEdits"/>
+   <addaction name="mActionAllEdits"/>
    <addaction name="mActionToggleEditing"/>
-   <addaction name="mActionSaveEdits"/>
    <addaction name="mActionAddFeature"/>
    <addaction name="mActionMoveFeature"/>
    <addaction name="mActionNodeTool"/>
@@ -1215,7 +1213,7 @@
    </property>
    <property name="icon">
     <iconset resource="../../images/images.qrc">
-     <normaloff>:/images/themes/default/mActionToggleEditing.png</normaloff>:/images/themes/default/mActionToggleEditing.png</iconset>
+     <normaloff>:/images/themes/default/mActionToggleEditing.svg</normaloff>:/images/themes/default/mActionToggleEditing.svg</iconset>
    </property>
    <property name="text">
     <string>Toggle Editing</string>
@@ -1227,10 +1225,10 @@
   <action name="mActionSaveEdits">
    <property name="icon">
     <iconset resource="../../images/images.qrc">
-     <normaloff>:/images/themes/default/mActionSaveEdits.png</normaloff>:/images/themes/default/mActionSaveEdits.png</iconset>
+     <normaloff>:/images/themes/default/mActionSaveEdits.svg</normaloff>:/images/themes/default/mActionSaveEdits.svg</iconset>
    </property>
    <property name="text">
-    <string>Save Edits</string>
+    <string>Save for Selected Layer(s)</string>
    </property>
    <property name="statusTip">
     <string>Save edits to current layer, but continue editing</string>
@@ -1855,16 +1853,91 @@ Acts on currently active editable layer</string>
   <action name="mActionSaveAllEdits">
    <property name="icon">
     <iconset resource="../../images/images.qrc">
-     <normaloff>:/images/themes/default/mActionSaveAllEdits.png</normaloff>:/images/themes/default/mActionSaveAllEdits.png</iconset>
+     <normaloff>:/images/themes/default/mActionSaveAllEdits.svg</normaloff>:/images/themes/default/mActionSaveAllEdits.svg</iconset>
    </property>
    <property name="text">
-    <string>Save Edits for All Layers</string>
+    <string>Save for All Layers</string>
    </property>
    <property name="toolTip">
-    <string>Save Edits for All Layers</string>
+    <string>Save for All Layers</string>
    </property>
    <property name="statusTip">
-    <string>Save edits for all layers, but continue editing</string>
+    <string/>
+   </property>
+  </action>
+  <action name="mActionRollbackAllEdits">
+   <property name="icon">
+    <iconset resource="../../images/images.qrc">
+     <normaloff>:/images/themes/default/mActionRollbackAllEdits.svg</normaloff>:/images/themes/default/mActionRollbackAllEdits.svg</iconset>
+   </property>
+   <property name="text">
+    <string>Rollback for All Layers</string>
+   </property>
+   <property name="toolTip">
+    <string>Rollback for All Layers</string>
+   </property>
+   <property name="statusTip">
+    <string/>
+   </property>
+  </action>
+  <action name="mActionCancelAllEdits">
+   <property name="icon">
+    <iconset resource="../../images/images.qrc">
+     <normaloff>:/images/themes/default/mActionCancelAllEdits.svg</normaloff>:/images/themes/default/mActionCancelAllEdits.svg</iconset>
+   </property>
+   <property name="text">
+    <string>Cancel for All Layers</string>
+   </property>
+   <property name="toolTip">
+    <string>Cancel for All Layers</string>
+   </property>
+   <property name="statusTip">
+    <string/>
+   </property>
+  </action>
+  <action name="mActionRollbackEdits">
+   <property name="icon">
+    <iconset resource="../../images/images.qrc">
+     <normaloff>:/images/themes/default/mActionRollbackEdits.svg</normaloff>:/images/themes/default/mActionRollbackEdits.svg</iconset>
+   </property>
+   <property name="text">
+    <string>Rollback for Selected Layer(s)</string>
+   </property>
+   <property name="toolTip">
+    <string>Rollback for Selected Layer(s)</string>
+   </property>
+   <property name="statusTip">
+    <string/>
+   </property>
+  </action>
+  <action name="mActionAllEdits">
+   <property name="icon">
+    <iconset resource="../../images/images.qrc">
+     <normaloff>:/images/themes/default/mActionAllEdits.svg</normaloff>:/images/themes/default/mActionAllEdits.svg</iconset>
+   </property>
+   <property name="text">
+    <string>Current Edits</string>
+   </property>
+   <property name="toolTip">
+    <string>Current Edits</string>
+   </property>
+   <property name="statusTip">
+    <string/>
+   </property>
+  </action>
+  <action name="mActionCancelEdits">
+   <property name="icon">
+    <iconset resource="../../images/images.qrc">
+     <normaloff>:/images/themes/default/mActionCancelEdits.svg</normaloff>:/images/themes/default/mActionCancelEdits.svg</iconset>
+   </property>
+   <property name="text">
+    <string>Cancel for Selected Layer(s)</string>
+   </property>
+   <property name="toolTip">
+    <string>Cancel for Selected Layer(s)</string>
+   </property>
+   <property name="statusTip">
+    <string/>
    </property>
   </action>
  </widget>