diff --git a/Plugins/org.blueberry.ui.qt.log/plugin.xml b/Plugins/org.blueberry.ui.qt.log/plugin.xml
index 8102ad6fb1..e65893e44d 100644
--- a/Plugins/org.blueberry.ui.qt.log/plugin.xml
+++ b/Plugins/org.blueberry.ui.qt.log/plugin.xml
@@ -1,14 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?BlueBerry version="0.1"?>
 <plugin>
   <extension point="org.blueberry.ui.views">
     <category
       id="org.blueberry.views.general"
       name="General"/>
     <view
       id="org.blueberry.views.logview"
       name="Logging"
       class="berry::LogView"
-    icon="resources/logging.svg" />
+      icon="resources/logging.svg"
+      category="General" />
   </extension>
 </plugin>
diff --git a/Plugins/org.mitk.gui.qt.datamanager/plugin.xml b/Plugins/org.mitk.gui.qt.datamanager/plugin.xml
index 9519ef5892..d214d15842 100644
--- a/Plugins/org.mitk.gui.qt.datamanager/plugin.xml
+++ b/Plugins/org.mitk.gui.qt.datamanager/plugin.xml
@@ -1,29 +1,29 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?eclipse version="3.0"?>
 <plugin>
   <extension point="org.blueberry.ui.views">
     <view
       id="org.mitk.views.datamanager"
       name="Data Manager"
-      category="Data handling"
+      category="Data"
       icon="resources/data-manager.svg"
       class="QmitkDataManagerView" />
   </extension>
 
   <extension point="org.blueberry.ui.preferencePages">
     <page id="org.mitk.gui.qt.application.DataManagerPreferencePage" name="Data Manager" class="QmitkDataManagerPreferencePage">
       <keywordreference id="org.mitk.gui.qt.application.DataManagerPreferencePageKeywords"></keywordreference>
     </page>
     <page id="org.mitk.gui.qt.application.DataManagerHotkeysPrefPage" name="Hotkeys" class="QmitkDataManagerHotkeysPrefPage" category="org.mitk.gui.qt.application.DataManagerPreferencePage">
       <keywordreference id="org.mitk.gui.qt.application.DataManagerHotkeysPrefPageKeywords"></keywordreference>
     </page>
   </extension>
 
   <extension point="org.blueberry.ui.keywords">
     <keyword id="org.mitk.gui.qt.application.DataManagerPreferencePageKeywords" label="data manager global reinit surface decimation parent helper objects single click property editing nodes top show containing data deleted added call"></keyword>
     <keyword id="org.mitk.gui.qt.application.DataManagerHotkeysPrefPageKeywords" label="data manager hotkeys delete selected nodes global reinit invisible show information toggle visibility selected"></keyword>
   </extension>
 
   <extension-point id="contextMenuActions" name="Context menu actions"/>
 
 </plugin>
diff --git a/Plugins/org.mitk.gui.qt.diffusionimaging/plugin.xml b/Plugins/org.mitk.gui.qt.diffusionimaging/plugin.xml
index c08090a4e7..1c5fc88745 100644
--- a/Plugins/org.mitk.gui.qt.diffusionimaging/plugin.xml
+++ b/Plugins/org.mitk.gui.qt.diffusionimaging/plugin.xml
@@ -1,60 +1,60 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?BlueBerry version="0.1"?>
 <plugin>
 
 
   <extension point="org.blueberry.ui.keywords">
 
   <keyword label="DICOM" id="org.mitk.views.dicomtractogramtageditor.Keyword"/>
   <keyword label="tractography" id="org.mitk.views.dicomtractogramtageditor.Keyword"/>
   <keyword label="tracking" id="org.mitk.views.dicomtractogramtageditor.Keyword"/>
   <keyword label="tractogram" id="org.mitk.views.dicomtractogramtageditor.Keyword"/>
   <keyword label="tag" id="org.mitk.views.dicomtractogramtageditor.Keyword"/>
 
   <keyword label="DICOM" id="org.mitk.views.diffusiondicomimport.Keyword"/>
   <keyword label="image" id="org.mitk.views.diffusiondicomimport.Keyword"/>
   <keyword label="data" id="org.mitk.views.diffusiondicomimport.Keyword"/>
   <keyword label="load" id="org.mitk.views.diffusiondicomimport.Keyword"/>
 
   </extension>
 
   <extension point="org.blueberry.ui.perspectives">
 
     <perspective id="org.mitk.perspectives.segmentation"
     name="Image Segmentation"
     class="QmitkSegmentationPerspective"
     icon="resources/segmentation.svg">
     <description>This perspective contains views to perform manual image segmentation.</description>
     </perspective>
 
   </extension>
 
   <extension point="org.blueberry.ui.views">
 
     <view id="org.mitk.views.diffusiondicomimport"
     name="DICOM Import"
-    category="Data handling"
+    category="Data"
     class="QmitkDiffusionDicomImport"
     icon="resources/dwiimport.png">
     <description>Diffusion DICOM data import</description>
     <keywordReference id="org.mitk.views.diffusiondicomimport.Keyword"/>
     </view>
 
     <view id="org.mitk.views.controlvisualizationpropertiesview"
     name="Visualization"
     icon="resources/vizControls.png"
     class="QmitkControlVisualizationPropertiesView">
     <keywordReference id="org.mitk.views.controlvisualizationpropertiesview.Keyword"/>
     </view>
 
     <view id="org.mitk.views.dicomtractogramtageditor"
     name="DICOM Tractogram Tag Editor"
     category="Fiber Tractography"
     class="QmitkDicomTractogramTagEditorView"
     icon="resources/dwiimport.png">
     <keywordReference id="org.mitk.views.dicomtractogramtageditor.Keyword"/>
     </view>
 
   </extension>
 
 </plugin>
diff --git a/Plugins/org.mitk.gui.qt.moviemaker/plugin.xml b/Plugins/org.mitk.gui.qt.moviemaker/plugin.xml
index ae56883781..df7bbc34a0 100644
--- a/Plugins/org.mitk.gui.qt.moviemaker/plugin.xml
+++ b/Plugins/org.mitk.gui.qt.moviemaker/plugin.xml
@@ -1,46 +1,48 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?BlueBerry version="0.1"?>
 <plugin>
 
   <extension point="org.blueberry.ui.views">
     <view id="org.mitk.views.moviemaker"
           name="Movie Maker"
           class="QmitkMovieMakerView"
-          icon="resources/video-camera.svg" >
+          icon="resources/video-camera.svg"
+          category="General" >
           <description>Take movies of your data</description>
           <keywordReference id="org.mitk.views.moviemaker.Keyword"/>
         </view>
   </extension>
 
   <extension point="org.blueberry.ui.views">
     <view id="org.mitk.views.screenshotmaker"
           name="Screenshot Maker"
           class="QmitkScreenshotMaker"
-          icon="resources/camera.svg" >
+          icon="resources/camera.svg"
+          category="General" >
       <description>Take screenshots of your data</description>
       <keywordReference id="org.mitk.views.screenshotmaker.Keyword"/>
     </view>
   </extension>
 
    <extension point="org.blueberry.ui.keywords">
     <keyword label="image" id="org.mitk.views.screenshotmaker.Keyword"/>
     <keyword label="picture" id="org.mitk.views.screenshotmaker.Keyword"/>
     <keyword label="screenshot" id="org.mitk.views.screenshotmaker.Keyword"/>
     <keyword label="capture" id="org.mitk.views.screenshotmaker.Keyword"/>
     <keyword label="png bmp jpg jepg" id="org.mitk.views.screenshotmaker.Keyword"/>
 
     <keyword label="movie" id="org.mitk.views.moviemaker.Keyword"/>
     <keyword label="clip" id="org.mitk.views.moviemaker.Keyword"/>
     <keyword label="capture" id="org.mitk.views.moviemaker.Keyword"/>
     <keyword label="avi" id="org.mitk.views.moviemaker.Keyword"/>
   </extension>
 
   <!--This extension points adds the screenshot and movie maker views to the
   "Window->Show Views" menu if the visualization perspective is opened-->
   <extension point="org.blueberry.ui.perspectiveExtensions">
            <perspectiveExtension targetID="org.mitk.mitkworkbench.perspectives.visualization">
                 <viewShortcut id="org.mitk.views.screenshotmaker"/>
                 <viewShortcut id="org.mitk.views.moviemaker"/>
            </perspectiveExtension>
   </extension>
 </plugin>
diff --git a/Plugins/org.mitk.gui.qt.pointsetinteraction/plugin.xml b/Plugins/org.mitk.gui.qt.pointsetinteraction/plugin.xml
index c26e7f7c35..0f6f71c23d 100644
--- a/Plugins/org.mitk.gui.qt.pointsetinteraction/plugin.xml
+++ b/Plugins/org.mitk.gui.qt.pointsetinteraction/plugin.xml
@@ -1,9 +1,10 @@
 <?xml version="1.0"?>
 <plugin>
   <extension point="org.blueberry.ui.views">
     <view id="org.mitk.views.pointsetinteraction"
           name="PointSet Interaction"
           class="QmitkPointSetInteractionView"
-          icon="resources/pointset_interaction.svg" />
+          icon="resources/pointset_interaction.svg"
+          category="General" />
   </extension>
 </plugin>
diff --git a/Plugins/org.mitk.gui.qt.properties/plugin.xml b/Plugins/org.mitk.gui.qt.properties/plugin.xml
index 1fa78d15e3..91f2c13b6e 100644
--- a/Plugins/org.mitk.gui.qt.properties/plugin.xml
+++ b/Plugins/org.mitk.gui.qt.properties/plugin.xml
@@ -1,22 +1,22 @@
 <?xml version="1.0"?>
 <plugin>
   <extension point="org.blueberry.ui.views">
     <view id="org.mitk.views.properties"
           name="Properties"
-          category="Data handling"
+          category="Data"
           class="QmitkPropertyTreeView"
           icon="resources/property_list.svg" >
           <description>View, Set, and Change properties of DataNodes</description>
     </view>
   </extension>
   <extension point="org.blueberry.ui.preferencePages">
     <page id="org.mitk.gui.qt.application.PropertiesPreferencePage" name="Properties" class="QmitkPropertiesPreferencePage">
       <keywordreference id="org.mitk.views.properties.Keyword"/>
     </page>
   </extension>
   <extension point="org.blueberry.ui.keywords">
     <keyword id="org.mitk.views.properties.Keyword" label="DataNode Data Show aliases properties replace genuine property name by" />
     <keyword id="org.mitk.views.properties.Keyword" label="show description persistence info filters filtered developer mode enabled" />
   </extension>
 
 </plugin>
diff --git a/Plugins/org.mitk.gui.qt.remeshing/plugin.xml b/Plugins/org.mitk.gui.qt.remeshing/plugin.xml
index 488c9e492d..55b2554713 100644
--- a/Plugins/org.mitk.gui.qt.remeshing/plugin.xml
+++ b/Plugins/org.mitk.gui.qt.remeshing/plugin.xml
@@ -1,9 +1,10 @@
 <?xml version="1.0"?>
 <plugin>
   <extension point="org.blueberry.ui.views">
     <view id="org.mitk.views.remeshing"
           name="Remeshing"
           class="QmitkRemeshingView"
-          icon="resources/RemeshingIcon.svg" />
+          icon="resources/RemeshingIcon.svg"
+          category="General" />
   </extension>
 </plugin>
diff --git a/Plugins/org.mitk.gui.qt.volumevisualization/plugin.xml b/Plugins/org.mitk.gui.qt.volumevisualization/plugin.xml
index e844ef43dc..3766778b5f 100755
--- a/Plugins/org.mitk.gui.qt.volumevisualization/plugin.xml
+++ b/Plugins/org.mitk.gui.qt.volumevisualization/plugin.xml
@@ -1,37 +1,38 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?BlueBerry version="0.1"?>
 <plugin>
   <extension point="org.blueberry.ui.views">
     <view
       id="org.mitk.views.volumevisualization"
       name="Volume Visualization"
       class="QmitkVolumeVisualizationView"
-      icon="resources/volume_visualization.svg" >
+      icon="resources/volume_visualization.svg"
+      category="General" >
       <description>Configure the 3D-Visualization of images.</description>
       <keywordReference id="org.mitk.views.volumevisualization.ViewKeyword"/>
     </view>
   </extension>
 
   <extension point="org.blueberry.ui.keywords">
     <keyword id="org.mitk.views.volumevisualization.ViewKeyword"  label="Visualisation" />
     <keyword id="org.mitk.views.volumevisualization.ViewKeyword"  label="3D" />
     <keyword id="org.mitk.views.volumevisualization.ViewKeyword"  label="Rendering" />
     <keyword id="org.mitk.views.volumevisualization.ViewKeyword"  label="Volumevisualisation" />
     <keyword id="org.mitk.views.volumevisualization.ViewKeyword"  label="Look-up-table" />
     <keyword id="org.mitk.views.volumevisualization.ViewKeyword"  label="Color Colour" />
   </extension>
 
   <!--This extension points adds the volume visualization view to the
   "Window->Show Views" menu if the visualization perspective is opened-->
   <extension point="org.blueberry.ui.perspectiveExtensions">
             <perspectiveExtension
                  targetID="org.mitk.mitkworkbench.perspectives.visualization">
                  <viewShortcut id="org.mitk.views.volumevisualization"/>
                  <view id="org.mitk.views.volumevisualization"
                              relative="org.mitk.views.datamanager"
                              relationship="bottom"
                              ratio="0.80"
                              visible="false"/>
             </perspectiveExtension>
   </extension>
 </plugin>
diff --git a/Plugins/org.mitk.gui.qt.xnat/plugin.xml b/Plugins/org.mitk.gui.qt.xnat/plugin.xml
index e096195700..e51abc25c8 100644
--- a/Plugins/org.mitk.gui.qt.xnat/plugin.xml
+++ b/Plugins/org.mitk.gui.qt.xnat/plugin.xml
@@ -1,53 +1,54 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <plugin>
 
   <extension point="org.blueberry.ui.editors">
     <editor id="org.mitk.editors.xnat.browser"
       name="XNAT Editor"
       class="QmitkXnatEditor"
       icon="resources/xnat-icon.png">
       <description>Search, browse and view the data in a XNAT-Installation</description>
       <keywordReference id="org.mitk.views.xnat.browser.ViewKeyword"/>
     </editor>
   </extension>
 
   <extension point="org.blueberry.ui.views">
     <view id="org.mitk.views.xnat.treebrowser"
       name="XNAT Tree Browser"
       class="QmitkXnatTreeBrowserView"
+      category="Data"
       icon="resources/xnat_treebrowser_icon.png">
       <description>Search, browse and view the data in a XNAT-Installation</description>
       <keywordReference id="org.mitk.views.xnat.treebrowser.ViewKeyword"/>
     </view>
   </extension>
 
   <extension point="org.blueberry.ui.preferencePages">
     <page id="org.mitk.gui.qt.application.XnatConnectionPreferencePage" name="Xnat Connection" class="QmitkXnatConnectionPreferencePage">
       <keywordreference id="org.mitk.gui.qt.application.XnatConnectionPreferencePageKeywords"></keywordreference>
     </page>
   </extension>
 
   <extension point="org.blueberry.ui.keywords">
     <keyword id="org.mitk.gui.qt.application.XnatConnectionPreferencePageKeywords" label="xnat session connection login settings server address port username password download path network proxy silent mode test connection"></keyword>
   </extension>
 
   <extension point="org.mitk.gui.qt.datamanager.contextMenuActions">
     <contextMenuAction nodeDescriptorName="Unknown" label="Upload to XNAT" icon=":/xnat-plugin/xnat-icon.png" class="QmitkUploadToXNATAction" />
   </extension>
 
   <extension point="org.blueberry.ui.keywords">
     <keyword id="org.mitk.views.xnat.treebrowser.ViewKeyword"  label="DICOM" />
     <keyword id="org.mitk.views.xnat.treebrowser.ViewKeyword"  label="WPACS" />
     <keyword id="org.mitk.views.xnat.treebrowser.ViewKeyword"  label="Data Source" />
     <keyword id="org.mitk.views.xnat.treebrowser.ViewKeyword"  label="Import" />
     <keyword id="org.mitk.views.xnat.treebrowser.ViewKeyword"  label="Data Handling" />
     <keyword id="org.mitk.views.xnat.treebrowser.ViewKeyword"  label="Data Loading" />
 
     <keyword id="org.mitk.views.xnat.browser.ViewKeyword"  label="DICOM" />
     <keyword id="org.mitk.views.xnat.browser.ViewKeyword"  label="WPACS" />
     <keyword id="org.mitk.views.xnat.browser.ViewKeyword"  label="Data Source" />
     <keyword id="org.mitk.views.xnat.browser.ViewKeyword"  label="Import" />
     <keyword id="org.mitk.views.xnat.browser.ViewKeyword"  label="Data Handling" />
     <keyword id="org.mitk.views.xnat.browser.ViewKeyword"  label="Data Loading" />
   </extension>
 </plugin>