diff --git a/Plugins/org.mitk.gui.qt.lasercontrol/files.cmake b/Plugins/org.mitk.gui.qt.lasercontrol/files.cmake
index 55ea3038dc..ebb9b41a94 100644
--- a/Plugins/org.mitk.gui.qt.lasercontrol/files.cmake
+++ b/Plugins/org.mitk.gui.qt.lasercontrol/files.cmake
@@ -1,37 +1,37 @@
 set(SRC_CPP_FILES
 
 )
 
 set(INTERNAL_CPP_FILES
   mitkLaserControlPluginActivator.cpp
   QmitkLaserControl.cpp
 
 )
 
 set(UI_FILES
   src/internal/QmitkLaserControlControls.ui
 )
 
 set(MOC_H_FILES
   src/internal/mitkLaserControlPluginActivator.h
   src/internal/QmitkLaserControl.h
 )
 
 set(CACHED_RESOURCE_FILES
-  resources/iconLaser.xpm
+  resources/iconLaserControl.svg
   plugin.xml
 )
 
 set(QRC_FILES
 
 )
 
 set(CPP_FILES)
 
 foreach(file ${SRC_CPP_FILES})
   set(CPP_FILES ${CPP_FILES} src/${file})
 endforeach(file ${SRC_CPP_FILES})
 
 foreach(file ${INTERNAL_CPP_FILES})
   set(CPP_FILES ${CPP_FILES} src/internal/${file})
 endforeach(file ${INTERNAL_CPP_FILES})
diff --git a/Plugins/org.mitk.gui.qt.lasercontrol/plugin.xml b/Plugins/org.mitk.gui.qt.lasercontrol/plugin.xml
index e480fff300..e2c8781409 100644
--- a/Plugins/org.mitk.gui.qt.lasercontrol/plugin.xml
+++ b/Plugins/org.mitk.gui.qt.lasercontrol/plugin.xml
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <plugin>
 
   <extension point="org.blueberry.ui.views">
     <view id="org.mitk.views.lasercontrol"
           name="OPO Laser Control"
           category="Photoacoustics"
           class="OPOLaserControl"
-          icon="resources/iconLaser.xpm" />
+          icon="resources/iconLaserControl.svg" />
   </extension>
 
 </plugin>
diff --git a/Plugins/org.mitk.gui.qt.lasercontrol/resources/iconLaserControl.svg b/Plugins/org.mitk.gui.qt.lasercontrol/resources/iconLaserControl.svg
new file mode 100644
index 0000000000..949e311a9f
--- /dev/null
+++ b/Plugins/org.mitk.gui.qt.lasercontrol/resources/iconLaserControl.svg
@@ -0,0 +1,88 @@
+<?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"
+   xml:space="preserve"
+   enable-background="new 0 0 1792 1792"
+   viewBox="0 0 1792 1792"
+   height="1792px"
+   width="1792px"
+   y="0px"
+   x="0px"
+   id="Layer_1"
+   version="1.1"
+   inkscape:version="0.91 r13725"
+   sodipodi:docname="lasercontrol.svg"><sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1549"
+     inkscape:window-height="1176"
+     id="namedview7"
+     showgrid="false"
+     inkscape:zoom="0.13169643"
+     inkscape:cx="-261.4391"
+     inkscape:cy="1848.2955"
+     inkscape:window-x="51"
+     inkscape:window-y="24"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="Layer_1"
+     showguides="false" /><metadata
+     id="metadata11"><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="defs9" /><path
+     style="fill:#00ff00;fill-opacity:1"
+     d="m 1546.475,971.52948 c -2.5396,17.0678 -11.6742,28.4607 -20.2992,25.3173 -8.625,-3.1434 -110.6423,-28.9171 -226.7051,-57.2748 -75.7963,-20.9626 -216.6504,-49.80976 -206.3877,-82.50378 11.7207,-32.52789 54.1509,-25.24622 225.1105,16.68961 113.1343,27.75147 211.8189,54.12067 219.2989,58.59817 7.48,4.4775 11.5223,22.1055 8.9826,39.1735 z M 1311.2534,589.61494 c -228.186,113.36811 -232.9991,115.05479 -246.1737,86.26771 -12.7024,-27.75541 -0.6477,-35.86131 220.4119,-148.21061 189.7548,-96.4393 236.1344,-115.2543 245.9685,-99.7835 6.6656,10.4863 12.2117,25.1481 12.3245,32.5818 0.1072,7.4337 -104.5262,65.5488 -232.5312,129.1446 z m -29.8664,-221.2506 c -122.7177,131.2618 -228.1348,244.1059 -234.2601,250.7646 -11.6961,12.7145 -52.46764,-13.1762 -52.46764,-33.3179 0,-9.1074 137.50324,-159.4617 441.53964,-482.8061 21.4778,-22.841802 23.3294,-22.782902 45.3515,1.4437 22.0667,24.2753 14.2816,34.5401 -200.1634,263.9157 z m -214.2461,824.18936 c -31.1499,11.9004 -42.0531,1.1165 -85.49364,-84.5576 -18.058,-45.0662 -41.3136,-71.738 -9.7489,-90.443 26.5485,-11.8182 33.72344,-5.7277 72.59894,61.6266 49.1763,85.2012 52.5232,101.9589 22.6436,113.374 z M 1004.708,893.81718 c -43.10534,62.8701 -110.93438,96.319 -180.79161,89.1546 -62.4626,-6.4061 -133.55682,-63.996 -157.5127,-102.49139 -19.63107,-31.54571 -20.2332,-26.6869 -382.75741,-26.6869 l -290.249663,0 0,-66.69492 0,-66.69491 290.249663,0 c 372.01574,0 372.6179,1.06221 382.75741,-26.68691 15.56116,-42.58671 95.0501,-96.08531 157.5127,-102.49141 112.85747,-11.5744 210.93781,79.50131 210.93781,195.87323 0,43.15328 -9.4145,76.48097 -30.1462,106.71861 z M 838.34579,533.65784 c -56.04137,-3.7966 -50.24585,-188.9999 -50.24585,-268.7299 -1.13119,-101.1803 -15.5521,-256.072992 36.06495,-267.520292 53.23243,-2.721504 42.08403,128.847192 43.71773,259.003892 0.2628,228.0256 20.6447,253.6837 -29.53683,277.2463 z M 552.4167,1310.6537 c -95.54787,144.8947 -179.09448,263.4449 -185.65914,263.4449 -6.56468,0 -26.64121,-19.9216 -35.33391,-30.3493 -12.7512,-15.2962 25.79193,-59.2139 167.7782,-274.8611 161.38614,-245.1114 178.12674,-265.9629 201.74064,-251.281 14.1629,8.8057 25.6263,19.0684 25.4742,22.806 -0.1522,3.7376 -78.4521,125.3458 -173.99999,270.2405 z"
+     id="path4225"
+     inkscape:connector-curvature="0"
+     sodipodi:nodetypes="ssccssssssscssssssssccsssssscccssssscccccsssssss" /><circle
+     style="opacity:1;fill:none;fill-opacity:1;stroke:#00ff00;stroke-width:40;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+     id="path4231"
+     cx="1680"
+     cy="1581.1672"
+     r="80" /><path
+     style="fill:none;fill-rule:evenodd;stroke:#00ff00;stroke-width:50;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+     d="m 1680,1665.7843 0,101.0786"
+     id="path4233"
+     inkscape:connector-curvature="0" /><path
+     style="fill:none;fill-rule:evenodd;stroke:#00ff00;stroke-width:50;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+     d="m 1680,1145.696 0,342.684"
+     id="path4233-5"
+     inkscape:connector-curvature="0" /><circle
+     style="opacity:1;fill:none;fill-opacity:1;stroke:#00ff00;stroke-width:40;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+     id="path4231-3"
+     cx="1460"
+     cy="1311.1672"
+     r="80" /><path
+     style="fill:none;fill-rule:evenodd;stroke:#00ff00;stroke-width:50;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+     d="m 1460,1404.0504 0,362.8125"
+     id="path4233-56"
+     inkscape:connector-curvature="0" /><path
+     style="fill:none;fill-rule:evenodd;stroke:#00ff00;stroke-width:50;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+     d="m 1460,1145.696 0,78.0454"
+     id="path4233-5-2"
+     inkscape:connector-curvature="0" /><circle
+     style="opacity:1;fill:none;fill-opacity:1;stroke:#00ff00;stroke-width:40;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+     id="path4231-9"
+     cx="1240"
+     cy="1457.1647"
+     r="80" /><path
+     style="fill:none;fill-rule:evenodd;stroke:#00ff00;stroke-width:50;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+     d="m 1239.9993,1550.4277 0,216.4352"
+     id="path4233-1"
+     inkscape:connector-curvature="0" /><path
+     style="fill:none;fill-rule:evenodd;stroke:#00ff00;stroke-width:50;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+     d="m 1239.9993,1145.696 0,211.0523"
+     id="path4233-5-27"
+     inkscape:connector-curvature="0" /></svg>
\ No newline at end of file
diff --git a/Plugins/org.mitk.gui.qt.photoacoustics.imageprocessing/resources/photoacousticsIcon.png b/Plugins/org.mitk.gui.qt.photoacoustics.imageprocessing/resources/photoacousticsIcon.png
deleted file mode 100644
index 7846083408..0000000000
Binary files a/Plugins/org.mitk.gui.qt.photoacoustics.imageprocessing/resources/photoacousticsIcon.png and /dev/null differ
diff --git a/Plugins/org.mitk.gui.qt.photoacoustics.pausviewer/files.cmake b/Plugins/org.mitk.gui.qt.photoacoustics.pausviewer/files.cmake
index a9177ae3a3..eabd5d2d68 100644
--- a/Plugins/org.mitk.gui.qt.photoacoustics.pausviewer/files.cmake
+++ b/Plugins/org.mitk.gui.qt.photoacoustics.pausviewer/files.cmake
@@ -1,29 +1,29 @@
 set(SRC_CPP_FILES
   QmitkPAUSViewerView.cpp
 )
 
 set(INTERNAL_CPP_FILES
   org_mitk_gui_qt_photoacoustics_pausviewer_Activator.cpp
 )
 
 set(UI_FILES
   src/internal/QmitkPAUSViewerViewControls.ui
 )
 
 set(MOC_H_FILES
   src/QmitkPAUSViewerView.h
   src/internal/org_mitk_gui_qt_photoacoustics_pausviewer_Activator.h
 )
 
 set(CACHED_RESOURCE_FILES
-  resources/PAUSViewer.png
+  resources/iconPAUSViewer.svg
   plugin.xml
 )
 
 foreach(file ${SRC_CPP_FILES})
   set(CPP_FILES ${CPP_FILES} src/${file})
 endforeach(file ${SRC_CPP_FILES})
 
 foreach(file ${INTERNAL_CPP_FILES})
   set(CPP_FILES ${CPP_FILES} src/internal/${file})
-endforeach(file ${INTERNAL_CPP_FILES})
\ No newline at end of file
+endforeach(file ${INTERNAL_CPP_FILES})
diff --git a/Plugins/org.mitk.gui.qt.photoacoustics.pausviewer/plugin.xml b/Plugins/org.mitk.gui.qt.photoacoustics.pausviewer/plugin.xml
index 915faef1ce..841dacc1b8 100644
--- a/Plugins/org.mitk.gui.qt.photoacoustics.pausviewer/plugin.xml
+++ b/Plugins/org.mitk.gui.qt.photoacoustics.pausviewer/plugin.xml
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <plugin>
   
   <extension point="org.blueberry.ui.views">
     <view id="org.mitk.views.photoacoustics.pausviewer"
           name="PA US Viewer"
           category="Photoacoustics"
           class="QmitkPAUSViewerView"
-          icon="resources/PAUSViewer.png" />
+          icon="resources/iconPAUSViewer.svg" />
   </extension>
 
 </plugin>
diff --git a/Plugins/org.mitk.gui.qt.photoacoustics.pausviewer/resources/PAUSViewer.png b/Plugins/org.mitk.gui.qt.photoacoustics.pausviewer/resources/PAUSViewer.png
deleted file mode 100644
index 7846083408..0000000000
Binary files a/Plugins/org.mitk.gui.qt.photoacoustics.pausviewer/resources/PAUSViewer.png and /dev/null differ
diff --git a/Plugins/org.mitk.gui.qt.photoacoustics.pausviewer/resources/iconPAUSViewer.svg b/Plugins/org.mitk.gui.qt.photoacoustics.pausviewer/resources/iconPAUSViewer.svg
new file mode 100644
index 0000000000..8e87197c19
--- /dev/null
+++ b/Plugins/org.mitk.gui.qt.photoacoustics.pausviewer/resources/iconPAUSViewer.svg
@@ -0,0 +1,62 @@
+<?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"
+   xml:space="preserve"
+   enable-background="new 0 0 1792 1792"
+   viewBox="0 0 1792 1792"
+   height="1792px"
+   width="1792px"
+   y="0px"
+   x="0px"
+   id="Layer_1"
+   version="1.1"
+   inkscape:version="0.91 r13725"
+   sodipodi:docname="iconPAUSViewer.svg"><sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1549"
+     inkscape:window-height="1176"
+     id="namedview7"
+     showgrid="false"
+     inkscape:zoom="0.26339286"
+     inkscape:cx="247.61536"
+     inkscape:cy="845.87763"
+     inkscape:window-x="51"
+     inkscape:window-y="24"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="Layer_1" /><metadata
+     id="metadata11"><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 /></cc:Work></rdf:RDF></metadata><defs
+     id="defs9" /><path
+     id="path3"
+     d="m 1081.897,890.02035 c 0,7.193 -2.63,13.417 -7.885,18.672 -5.256,5.257 -11.479,7.885 -18.673,7.885 -7.194,0 -13.418,-2.628 -18.673,-7.885 -5.256,-5.256 -7.885,-11.479 -7.885,-18.672 0,-25.45 -14.938,-45.091 -44.813,-58.923 -29.875,-13.832 -59.198,-20.747 -87.968,-20.747 -7.193,0 -13.417,-2.628 -18.673,-7.884 -5.255,-5.256 -7.884,-11.48 -7.884,-18.673 0,-7.193 2.628,-13.417 7.884,-18.673 5.256,-5.256 11.48,-7.884 18.673,-7.884 27.663,0 55.188,4.426 82.574,13.278 27.387,8.853 51.453,23.791 72.201,44.814 20.747,21.025 31.122,45.922 31.122,74.692 z m 132.783,0 c 0,-39.835 -9.544,-76.904 -28.632,-111.206 -19.087,-34.302 -43.983,-62.38 -74.689,-84.234 -30.706,-21.854 -64.732,-39.005 -102.078,-51.454 -37.345,-12.448 -75.105,-18.672 -113.28,-18.672 -38.175,0 -75.936,6.224 -113.281,18.672 -37.345,12.449 -71.371,29.6 -102.076,51.454 -30.707,21.854 -55.603,49.932 -74.691,84.234 -19.087,34.302 -28.631,71.371 -28.631,111.206 0,55.879 18.812,105.672 56.433,149.38005 5.533,6.086 13.97,15.215 25.312,27.387 11.342,12.173 19.778,21.301 25.312,27.387 70.817,84.649 109.822,167.085 117.015,247.309 l 189.216,0 c 7.193,-80.224 46.199,-162.659 117.017,-247.309 5.532,-6.086 13.969,-15.214 25.312,-27.387 11.342,-12.172 19.779,-21.301 25.311,-27.387 37.619,-43.70805 56.43,-93.50105 56.43,-149.38005 z m 106.226,0 c 0,85.755 -28.493,159.89305 -85.479,222.41205 -24.897,27.11 -45.505,51.177 -61.827,72.201 -16.321,21.023 -32.78,47.442 -49.379,79.254 -16.597,31.812 -26.003,61.551 -28.216,89.215 26.003,15.491 39.006,38.174 39.006,68.051 0,20.472 -6.917,38.175 -20.748,53.113 13.831,14.938 20.748,32.643 20.748,53.114 0,28.769 -12.448,51.176 -37.346,67.221 7.192,12.725 10.788,25.727 10.788,39.005 0,25.45 -8.714,45.091 -26.142,58.923 -17.429,13.832 -38.867,20.747 -64.317,20.747 -11.064,24.344 -27.663,43.708 -49.793,58.092 -22.131,14.384 -46.198,21.577 -72.201,21.577 -26.003,0 -50.07,-7.193 -72.201,-21.578 -22.131,-14.384 -38.729,-33.748 -49.794,-58.092 -25.451,0 -46.889,-6.915 -64.317,-20.747 -17.428,-13.832 -26.142,-33.473 -26.142,-58.923 0,-13.278 3.596,-26.28 10.789,-39.005 -24.896,-16.045 -37.345,-38.452 -37.345,-67.221 0,-20.472 6.915,-38.176 20.748,-53.114 -13.833,-14.938 -20.748,-32.642 -20.748,-53.113 0,-29.877 13.002,-52.56 39.005,-68.051 -2.213,-27.664 -11.618,-57.402 -28.216,-89.215 -16.598,-31.812 -33.058,-58.23 -49.379,-79.254 -16.321,-21.024 -36.93,-45.091 -61.827,-72.201 -56.987,-62.519 -85.479,-136.65605 -85.479,-222.41205 0,-54.773 12.31,-105.812 36.931,-153.116 24.621,-47.304 56.986,-86.586 97.097,-117.845 40.112,-31.259 85.479,-55.88 136.104,-73.861 50.622,-17.98 102.214,-26.97 154.774,-26.97 52.56,0 104.151,8.991 154.775,26.972 50.624,17.98 95.991,42.602 136.103,73.861 40.11,31.259 72.478,70.541 97.099,117.845 24.62,47.303 36.929,98.342 36.929,153.115 z"
+     style="fill:#00ff00;fill-opacity:1;stroke:none"
+     inkscape:connector-curvature="0" /><path
+     id="path5"
+     d="M 1725.825,706 1728,986 c -14.667,55.333 -44.833,100.833 -90.5,136.5 -45.667,35.667 -97.833,53.5 -156.5,53.5 l 0,32 c 0,9.333 -3,17 -9,23 -6,6 -13.667,9 -23,9 l -64,0 c -9.333,0 -17,-3 -23,-9 -6,-6 -9,-13.667 -9,-23 l 0,-576 c 0,-9.333 3,-17 9,-23 6,-6 13.667,-9 23,-9 l 64,0 c 9.333,0 17,3 23,9 6,6 9,13.667 9,23 l 0,32 c 47.333,0 90.667,11.833 130,35.5 l -75,60.5 c 0,0 -9.333,-221.667 -68,-309 -58.667,-87.333 -147.5,-157 -246.5,-209 -99,-52 -214.167,-78 -325.5,-78 -111.333,0 -226.5,26 -325.5,78 -99,52 -187.833,121.667 -246.5,209 -58.667,87.333 -68,309 -68,309 L 181,699.5 C 220.333,675.833 263.667,664 311,664 l 0,-32 c 0,-9.333 3,-17 9,-23 6,-6 13.667,-9 23,-9 l 64,0 c 9.333,0 17,3 23,9 6,6 9,13.667 9,23 l 0,576 c 0,9.333 -3,17 -9,23 -6,6 -13.667,9 -23,9 l -64,0 c -9.333,0 -17,-3 -23,-9 -6,-6 -9,-13.667 -9,-23 l 0,-32 c -58.667,0 -110.833,-17.833 -156.5,-53.5 C 108.833,1086.833 78.667,1041.333 64,986 L 64,760 C 64,659.333 86.333,562.333 131,469 175.667,375.667 235.333,294.833 310,226.5 384.667,158.167 473.333,103.667 576,63 678.667,22.333 785.333,2 896,2 c 110.667,0 217.333,20.333 320,61 102.667,40.667 191.333,95.167 266,163.5 74.667,68.333 134.333,149.167 179,242.5 44.667,93.333 67,190.333 67,291"
+     style="stroke:none;fill:#00ff00;fill-opacity:1" /><rect
+     style="opacity:1;fill:none;fill-opacity:1;stroke:#00ff00;stroke-width:96.76943207;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+     id="rect4153-3-7"
+     width="443.23056"
+     height="443.23056"
+     x="112.38472"
+     y="1301.3301" /><rect
+     style="opacity:1;fill:none;fill-opacity:1;stroke:#00ff00;stroke-width:96.76943207;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+     id="rect4153-3-7-3"
+     width="443.23056"
+     height="443.23056"
+     x="1236.3848"
+     y="1301.3301" /></svg>
\ No newline at end of file