diff --git a/Documentation/Doxygen/2-UserManual/MITKPluginManualsList.dox b/Documentation/Doxygen/2-UserManual/MITKPluginManualsList.dox
index 018001bdbb..264495eefb 100644
--- a/Documentation/Doxygen/2-UserManual/MITKPluginManualsList.dox
+++ b/Documentation/Doxygen/2-UserManual/MITKPluginManualsList.dox
@@ -1,63 +1,69 @@
 /**
 \page PluginListPage MITK Plugin Manuals
 
 The plugins and bundles provide much of the extended functionality of MITK. Each encapsulates a solution to a problem and associated features. This way one can easily assemble the necessary capabilites for a workflow without adding a lot of bloat, by combining plugins as needed.
 
 <ul>
   <li> \subpage org_mitk_views_basicimageprocessing </li>
   <li> \subpage org_mitk_views_datamanager </li>
   <li> \subpage org_mitk_editors_dicombrowser </li>
   <li> \subpage org_mitk_views_dicominspector </li>
   <li> \subpage org_mitk_views_imagecropper </li>
   <li> \subpage org_mitk_views_imagenavigator </li>
+  <li> \subpage org_mitk_views_pixelvalue </li>
   <li> \subpage org_blueberry_views_logview </li>
   <li> \subpage org_mitk_views_matchpoint_algorithm_browser </li>
   <li> \subpage org_mitk_views_matchpoint_algorithm_control </li>
   <li> \subpage org_mitk_views_matchpoint_evaluator </li>
   <li> \subpage org_mitk_views_matchpoint_framereg </li>
   <li> \subpage org_mitk_views_matchpoint_manipulator </li>
   <li> \subpage org_mitk_views_matchpoint_mapper </li>
   <li> \subpage org_mitk_views_matchpoint_visualizer </li>
-  <li> \subpage org_mitk_views_measurement </li>
-  <li> \subpage org_mitk_views_imagestatistics </li>
+  <li> \subpage org_mitk_gui_qt_measurementtoolbox
+    <ul>
+      <li> \subpage org_mitk_views_measurement </li>
+      <li> \subpage org_mitk_views_imagestatistics </li>
+    </ul>
+  </li>
   <li> \subpage org_mitk_views_moviemaker </li>
   <li> \subpage org_mitk_views_pointsetinteraction </li>
   <li> \subpage org_mitk_views_python </li>
   <li> \subpage org_mitk_views_remeshing </li>
   <li> \subpage org_mitk_views_screenshotmaker </li>
   <li> \subpage org_mitk_views_segmentation </li>
   <li> \subpage org_mitk_editors_stdmultiwidget </li>
   <li> \subpage org_mitk_views_deformableclippingplane </li>
   <li> \subpage org_mitk_views_viewnavigator </li>
   <li> \subpage org_mitk_views_volumevisualization </li>
   <li> \subpage org_mitk_views_properties </li>
   <li> \subpage org_mitk_gui_qt_flowapplication </li>
+  <li> \subpage org_mitk_gui_qt_flow_segmentation </li>
   <li> \subpage org_mitk_gui_qt_aicpregistration </li>
   <li> \subpage org_mitk_gui_qt_cest </li>
   <li> \subpage org_mitk_gui_qt_classificationsegmentation </li>
   <li> \subpage org_mitk_views_cmdlinemodules </li>
   <li> \subpage org_mitk_views_pharmacokinetics_concentration_mri </li>
   <li> \subpage org_mitk_views_pharmacokinetics_mri </li>
   <li> \subpage org_mitk_views_pharmacokinetics_pet </li>
   <li> \subpage org_mitk_gui_qt_examples </li>
   <li> \subpage org_mitk_gui_qt_geometrytools </li>
   <li> \subpage org_mitk_gui_qt_igtexample </li>
   <li> \subpage org_mitk_gui_qt_igttracking </li>
   <li> \subpage org_mitk_views_igttrackingsemiautomaticmeasurement </li>
   <li> \subpage org_mitk_views_fit_demo </li>
   <li> \subpage org_mitk_views_fit_genericfitting </li>
   <li> \subpage org_mitk_views_fit_inspector </li>
   <li> \subpage org_mitkexamplesopencv </li>
   <li> \subpage org_mitk_gui_qt_overlaymanager </li>
   <li> \subpage org_mitk_gui_qt_mitkphenotyping </li>
   <li> \subpage org_mitk_gui_qt_preprocessing_resampling </li>
   <li> \subpage org_mitk_views_pharmacokinetics_curvedescriptor </li>
-  <li> \subpage org_mitk_gui_qt_pharmacokinetics_simulation </li>
+  <li> \subpage org_mitk_views_pharmacokinetics_simulation </li>
   <li> \subpage org_surfacematerialeditor </li>
   <li> \subpage org_toftutorial </li>
   <li> \subpage org_blueberry_ui_qt_objectinspector </li>
   <li> \subpage org_mitk_gui_qt_ultrasound </li>
   <li> \subpage org_mitk_gui_qt_xnat </li>
 </ul>
 
 */
diff --git a/Plugins/org.mitk.gui.qt.measurementtoolbox/documentation/UserManual/QmitkMeasurementToolbox_ImageStatisticsIcon.png b/Plugins/org.mitk.gui.qt.measurementtoolbox/documentation/UserManual/QmitkMeasurementToolbox_ImageStatisticsIcon.png
deleted file mode 100644
index 5aaa3fc221..0000000000
Binary files a/Plugins/org.mitk.gui.qt.measurementtoolbox/documentation/UserManual/QmitkMeasurementToolbox_ImageStatisticsIcon.png and /dev/null differ
diff --git a/Plugins/org.mitk.gui.qt.measurementtoolbox/documentation/UserManual/QmitkMeasurementToolbox_MeasurementIcon.png b/Plugins/org.mitk.gui.qt.measurementtoolbox/documentation/UserManual/QmitkMeasurementToolbox_MeasurementIcon.png
deleted file mode 100644
index 3907445ef6..0000000000
Binary files a/Plugins/org.mitk.gui.qt.measurementtoolbox/documentation/UserManual/QmitkMeasurementToolbox_MeasurementIcon.png and /dev/null differ
diff --git a/Plugins/org.mitk.gui.qt.measurementtoolbox/documentation/UserManual/bar-chart2-dox.svg b/Plugins/org.mitk.gui.qt.measurementtoolbox/documentation/UserManual/bar-chart2-dox.svg
index 6173a2c58d..9660b50e29 100644
--- a/Plugins/org.mitk.gui.qt.measurementtoolbox/documentation/UserManual/bar-chart2-dox.svg
+++ b/Plugins/org.mitk.gui.qt.measurementtoolbox/documentation/UserManual/bar-chart2-dox.svg
@@ -1,75 +1,75 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <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:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
    width="128"
    height="128"
    viewBox="0 0 2621440 2293760"
    id="svg2"
    version="1.1"
    inkscape:version="0.92.3 (2405546, 2018-03-11)"
    sodipodi:docname="bar-chart2.svg">
   <metadata
      id="metadata10">
     <rdf:RDF>
       <cc:Work
          rdf:about="">
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
         <dc:title></dc:title>
       </cc:Work>
     </rdf:RDF>
   </metadata>
   <defs
      id="defs8" />
   <sodipodi:namedview
      pagecolor="#ffffff"
      bordercolor="#666666"
      borderopacity="1"
      objecttolerance="10"
      gridtolerance="10"
      guidetolerance="10"
      inkscape:pageopacity="0"
      inkscape:pageshadow="2"
      inkscape:window-width="1920"
      inkscape:window-height="1137"
      id="namedview6"
      showgrid="false"
      inkscape:zoom="4"
      inkscape:cx="34.145726"
      inkscape:cy="108.17143"
      inkscape:window-x="-8"
      inkscape:window-y="-8"
      inkscape:window-maximized="1"
      inkscape:current-layer="svg2"
      units="px" />
   <path
      d="m 819200.07,1187840 v 655359.9 H 491520.05 V 1187840 Z m 481280.03,0 10240,655359.9 H 983040.12 l -10240,-655359.9 z m 1320960,819200 v 163840 H 0 V 204799.84 H 163840.02 V 2007040 Z M 1802240.2,860159.82 V 1843199.9 H 1474560.1 V 860159.82 Z m 491520,-491519.91 V 1843199.9 h -327680 V 368639.91 Z"
      id="path4"
-     style="fill:#00ff00;fill-opacity:1;stroke:none;stroke-width:0.99999994"
+     style="fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.99999994"
      inkscape:connector-curvature="0"
      sodipodi:nodetypes="ccccccccccccccccccccccccccc" />
   <path
      sodipodi:type="star"
-     style="fill:#00ff00;stroke-width:24753.11132812"
+     style="fill:#000000;stroke-width:24753.11132812"
      id="path6589"
      sodipodi:sides="5"
      sodipodi:cx="889765.88"
      sodipodi:cy="652603.44"
      sodipodi:r1="601505.62"
      sodipodi:r2="300752.81"
      sodipodi:arg1="0.93141042"
      sodipodi:arg2="1.559729"
      inkscape:flatsided="false"
      inkscape:rounded="0"
      inkscape:randomized="0"
      d="M 1248685.9,1135289 893094.34,953337.83 541616.98,1143114.8 604779.02,748701.03 315677.95,473070.5 710305.85,411260.62 883108.92,51134.65 l 180731.38,356213.13 395899.3,53060.44 -282929.8,281961.7 z"
      inkscape:transform-center-x="2057.1205"
      inkscape:transform-center-y="-55478.7" />
 </svg>
diff --git a/Plugins/org.mitk.gui.qt.pharmacokinetics.simulation/documentation/doxygen/modules.dox b/Plugins/org.mitk.gui.qt.pharmacokinetics.simulation/documentation/doxygen/modules.dox
deleted file mode 100644
index f949cca550..0000000000
--- a/Plugins/org.mitk.gui.qt.pharmacokinetics.simulation/documentation/doxygen/modules.dox
+++ /dev/null
@@ -1,16 +0,0 @@
-/**
-  \defgroup org_mitk_gui_qt_pharmacokinetics_simulation org.mitk.gui.qt.pharmacokinetics.simulation
-  \ingroup MITKPlugins
-
-  \brief Describe your plugin here.
-
-*/
-
-/**
-  \defgroup org_mitk_gui_qt_pharmacokinetics_simulation_internal Internal
-  \ingroup org_mitk_gui_qt_pharmacokinetics_simulation
-
-  \brief This subcategory includes the internal classes of the org.mitk.gui.qt.pharmacokinetics.simulation plugin. Other
-  plugins must not rely on these classes. They contain implementation details and their interface
-  may change at any time. We mean it.
-*/