From d00b84de7be837711590fe7e7491f98651b9226b Mon Sep 17 00:00:00 2001
From: Patric Plitzner <p.plitzner@bgbm.org>
Date: Tue, 10 Dec 2013 15:06:02 +0000
Subject: [PATCH]  - added icons for derivate views  - enhanced
 DerivateViewEditorInput handling

---
 .gitattributes                                |  15 ++---
 .../icons/specimen_derivate-16x16-32.gif      | Bin 995 -> 0 bytes
 .../icons/specimen_derivate-16x16-32.png      | Bin 0 -> 1283 bytes
 eu.etaxonomy.taxeditor.application/plugin.xml |   2 +-
 .../TransientOccurenceService.java            |   8 +++
 .../icons/derivate_view-16x16-32.png          | Bin 0 -> 1211 bytes
 eu.etaxonomy.taxeditor.editor/plugin.xml      |   1 +
 .../taxeditor/editor/EditorUtil.java          |   3 +-
 .../handler/OpenDerivateViewHandler.java      |   9 +--
 .../derivate/DerivateContentProvider.java     |  30 ++++++----
 .../editor/view/derivate/DerivateView.java    |   4 +-
 .../derivate/DerivateViewEditorInput.java     |  54 ++++++++++++++++--
 .../icons/artwork_derivate-16x16-32.gif       | Bin 1022 -> 0 bytes
 .../icons/derivate_search_view-16x16-32.png   | Bin 0 -> 1279 bytes
 .../icons/dna_derivate-16x16-32.gif           | Bin 992 -> 0 bytes
 .../icons/dna_derivate-16x16-32.png           | Bin 0 -> 1262 bytes
 .../icons/fieldunit-16x16-32.gif              | Bin 977 -> 0 bytes
 .../icons/fieldunit-16x16-32.png              | Bin 0 -> 1249 bytes
 .../icons/specimen_derivate-16x16-32.gif      | Bin 995 -> 0 bytes
 .../icons/specimen_derivate-16x16-32.png      | Bin 0 -> 1283 bytes
 .../icons/specimen_scan_derivate-16x16-32.gif | Bin 1036 -> 0 bytes
 .../icons/specimen_scan_derivate-16x16-32.png | Bin 0 -> 1314 bytes
 .../icons/tissue_sample-16x16-32.gif          | Bin 1002 -> 0 bytes
 .../icons/tissue_sample-16x16-32.png          | Bin 0 -> 1287 bytes
 eu.etaxonomy.taxeditor.store/plugin.xml       |   1 +
 .../taxeditor/model/ImageResources.java       |  12 ++--
 26 files changed, 98 insertions(+), 41 deletions(-)
 delete mode 100644 eu.etaxonomy.taxeditor.application/icons/specimen_derivate-16x16-32.gif
 create mode 100644 eu.etaxonomy.taxeditor.application/icons/specimen_derivate-16x16-32.png
 create mode 100644 eu.etaxonomy.taxeditor.editor/icons/derivate_view-16x16-32.png
 delete mode 100644 eu.etaxonomy.taxeditor.store/icons/artwork_derivate-16x16-32.gif
 create mode 100644 eu.etaxonomy.taxeditor.store/icons/derivate_search_view-16x16-32.png
 delete mode 100644 eu.etaxonomy.taxeditor.store/icons/dna_derivate-16x16-32.gif
 create mode 100644 eu.etaxonomy.taxeditor.store/icons/dna_derivate-16x16-32.png
 delete mode 100644 eu.etaxonomy.taxeditor.store/icons/fieldunit-16x16-32.gif
 create mode 100644 eu.etaxonomy.taxeditor.store/icons/fieldunit-16x16-32.png
 delete mode 100644 eu.etaxonomy.taxeditor.store/icons/specimen_derivate-16x16-32.gif
 create mode 100644 eu.etaxonomy.taxeditor.store/icons/specimen_derivate-16x16-32.png
 delete mode 100644 eu.etaxonomy.taxeditor.store/icons/specimen_scan_derivate-16x16-32.gif
 create mode 100644 eu.etaxonomy.taxeditor.store/icons/specimen_scan_derivate-16x16-32.png
 delete mode 100644 eu.etaxonomy.taxeditor.store/icons/tissue_sample-16x16-32.gif
 create mode 100644 eu.etaxonomy.taxeditor.store/icons/tissue_sample-16x16-32.png

diff --git a/.gitattributes b/.gitattributes
index 9230825b9..11368e746 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -10,7 +10,7 @@ eu.etaxonomy.taxeditor.application/icons/256color_32x32.gif -text
 eu.etaxonomy.taxeditor.application/icons/256color_48x48.gif -text
 eu.etaxonomy.taxeditor.application/icons/256color_48x48.ico -text
 eu.etaxonomy.taxeditor.application/icons/edit_16x16.gif -text
-eu.etaxonomy.taxeditor.application/icons/specimen_derivate-16x16-32.gif -text
+eu.etaxonomy.taxeditor.application/icons/specimen_derivate-16x16-32.png -text
 eu.etaxonomy.taxeditor.application/p2.inf -text
 eu.etaxonomy.taxeditor.application/plugin.properties -text
 eu.etaxonomy.taxeditor.application/plugin.xml -text
@@ -335,6 +335,7 @@ eu.etaxonomy.taxeditor.editor/META-INF/MANIFEST.MF -text
 eu.etaxonomy.taxeditor.editor/build.properties -text
 eu.etaxonomy.taxeditor.editor/icons/address-book-new.png -text
 eu.etaxonomy.taxeditor.editor/icons/camera-photo.png -text
+eu.etaxonomy.taxeditor.editor/icons/derivate_view-16x16-32.png -text
 eu.etaxonomy.taxeditor.editor/icons/edit_16x16.gif -text
 eu.etaxonomy.taxeditor.editor/icons/emblem-photos.png -text
 eu.etaxonomy.taxeditor.editor/icons/leaf_detail.png -text
@@ -948,7 +949,6 @@ eu.etaxonomy.taxeditor.store/icons/add_no_bg2.gif -text
 eu.etaxonomy.taxeditor.store/icons/alt_window_16.gif -text
 eu.etaxonomy.taxeditor.store/icons/alt_window_32.gif -text
 eu.etaxonomy.taxeditor.store/icons/applications-office.png -text
-eu.etaxonomy.taxeditor.store/icons/artwork_derivate-16x16-32.gif -text
 eu.etaxonomy.taxeditor.store/icons/artwork_derivate-16x16-32.png -text
 eu.etaxonomy.taxeditor.store/icons/autonym_no_bg.gif -text
 eu.etaxonomy.taxeditor.store/icons/back.gif -text
@@ -973,7 +973,8 @@ eu.etaxonomy.taxeditor.store/icons/db.gif -text
 eu.etaxonomy.taxeditor.store/icons/debug.gif -text
 eu.etaxonomy.taxeditor.store/icons/delete.gif -text
 eu.etaxonomy.taxeditor.store/icons/delete_edit.gif -text
-eu.etaxonomy.taxeditor.store/icons/dna_derivate-16x16-32.gif -text
+eu.etaxonomy.taxeditor.store/icons/derivate_search_view-16x16-32.png -text
+eu.etaxonomy.taxeditor.store/icons/dna_derivate-16x16-32.png -text
 eu.etaxonomy.taxeditor.store/icons/eclipse.gif -text
 eu.etaxonomy.taxeditor.store/icons/edit_16x16.gif -text
 eu.etaxonomy.taxeditor.store/icons/edit_16x16.ico -text
@@ -981,7 +982,7 @@ eu.etaxonomy.taxeditor.store/icons/edit_256color.ICO -text
 eu.etaxonomy.taxeditor.store/icons/error_co.gif -text
 eu.etaxonomy.taxeditor.store/icons/expandAll.jpg -text
 eu.etaxonomy.taxeditor.store/icons/export.gif -text
-eu.etaxonomy.taxeditor.store/icons/fieldunit-16x16-32.gif -text
+eu.etaxonomy.taxeditor.store/icons/fieldunit-16x16-32.png -text
 eu.etaxonomy.taxeditor.store/icons/file_obj.gif -text
 eu.etaxonomy.taxeditor.store/icons/filter.gif -text
 eu.etaxonomy.taxeditor.store/icons/flat.gif -text
@@ -1051,8 +1052,8 @@ eu.etaxonomy.taxeditor.store/icons/search_src.gif -text
 eu.etaxonomy.taxeditor.store/icons/settings.gif -text
 eu.etaxonomy.taxeditor.store/icons/smartmode_co.gif -text
 eu.etaxonomy.taxeditor.store/icons/sort.gif -text
-eu.etaxonomy.taxeditor.store/icons/specimen_derivate-16x16-32.gif -text
-eu.etaxonomy.taxeditor.store/icons/specimen_scan_derivate-16x16-32.gif -text
+eu.etaxonomy.taxeditor.store/icons/specimen_derivate-16x16-32.png -text
+eu.etaxonomy.taxeditor.store/icons/specimen_scan_derivate-16x16-32.png -text
 eu.etaxonomy.taxeditor.store/icons/step_done.gif -text
 eu.etaxonomy.taxeditor.store/icons/swap.gif -text
 eu.etaxonomy.taxeditor.store/icons/swap2.gif -text
@@ -1066,7 +1067,7 @@ eu.etaxonomy.taxeditor.store/icons/th_vertical.gif -text
 eu.etaxonomy.taxeditor.store/icons/thin_close_view.gif -text
 eu.etaxonomy.taxeditor.store/icons/thin_max_view.gif -text
 eu.etaxonomy.taxeditor.store/icons/thin_restore_view.GIF -text
-eu.etaxonomy.taxeditor.store/icons/tissue_sample-16x16-32.gif -text
+eu.etaxonomy.taxeditor.store/icons/tissue_sample-16x16-32.png -text
 eu.etaxonomy.taxeditor.store/icons/trash.gif -text
 eu.etaxonomy.taxeditor.store/icons/tree_icon_small.jpg -text
 eu.etaxonomy.taxeditor.store/icons/undo.gif -text
diff --git a/eu.etaxonomy.taxeditor.application/icons/specimen_derivate-16x16-32.gif b/eu.etaxonomy.taxeditor.application/icons/specimen_derivate-16x16-32.gif
deleted file mode 100644
index 6588e07dab0ecf2155848b34e4062bbb65edc045..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 995
zcmV<9104KENk%w1VGsZi0CxZYA^!_bMO0HmK~P09E-(WD0000X`2+|G0000i00000
z5C9MWhaPt|uZgsFc6R9E=v|9x(!SJtuZT`vQL4eOkW`m^e{-abq{^|)F@Qz?|Npwr
zztG;(reCloe?6MMqja}eKa5nbuc*n}!j_qb+uGV5i#mq0lJxZSms6mJhkn}0-6?`U
zr>3T0pl{#g;JB8)$;8N^b*D>`TpWNll46&q!L5CkgT&Ryki49Pql_MdIeu<=UYBj*
z;L^+6&#uX}wzakO{q>evp5g7??(Xg#do`O|qs_C?;@;xl(BZ<%#Q693A%i+Kg-X1k
zzG$6wOq*bWj)jAAev?+4n^UHYvXxnyYQ56J&$-dz=i`Q`j+k1XEr3F@$+wunqNS;&
z;M3yG+|i<SsaRN8Sy@?HT3TCMTU=aRU0q#XUS3~cUtnNhVPRonVq#-sV`OAxWo2b%
zW@cw+XJ}|>X=!O{YHDk1Yiw+6ZEbCCZf<XHZ*XvMadB~Sa&mKXb98icb#--ic6N7n
zcX)Vsd3kwydU|_%dwhI+eSLj?etv&{e}I61fq{X7f`WsCgM@^Hg@uKNhK7fShlq%X
ziHV7dii(Sii;Rqnjg5_tj*gFykC2d%k&%&-l9H2?la!Q{m6es2mX?>7mzbECnVFfI
znwp!No1C1Sot>SYo}QndpP-<ip`oFoqN1atqokyyrKP2&rlzN-r>Ll?si~=|s;aB2
ztE{Z7t*x!DuCA}IuduMNv9YnTva++Yv$V9dwY9ajwzjvox45{txw*Nzy1Ki&yS%)-
zy}iA@zP`V|zreu2!NI}8!otJD!^FhI#l^+O#>U6T$H>UY$;rve%F4^j%goHo&CSiu
z&d$%z&(P4&(b3V;($dq@)6~?|)z#J3*4Ee8*Vx$D+1c6J+S=RO+uYpT-QC^Z-rnEe
z-{9cj;o;%p;^O1u<K*Pz<>lq(=H}<;=jiC@>FMd}>gwz3>+J08?d|RE?(XmJ@9^;O
z@$vEU^78ZZ^Yrxe_4W1k_V)Mp_xSku`T6<!`uh9(`~3X;{r&y^{{H{}{|K!B9S9ug
zzy`sC1TRqVumIsf914!WNK(b&KpX)&AVG4);y@lZkR;eaVt_{<P<BKx!Jvo74>yLS
zXo7GAK?VgJV308o$c!fhVkl9;!etH%4j^n;A|wbADM4Pm&>;i?hY~b&Xn29*1rrVu
zPyo;&_D78<D0Gn3Ve^EBv^rk6pfZ)L1|b5aXxRHA$chjR_G$pZWZ(l46^cwTa==Op
R0~4Hh%pky{Wr6_#06U+kJ;eY3

diff --git a/eu.etaxonomy.taxeditor.application/icons/specimen_derivate-16x16-32.png b/eu.etaxonomy.taxeditor.application/icons/specimen_derivate-16x16-32.png
new file mode 100644
index 0000000000000000000000000000000000000000..35b8a1a9bc4f8a9cf4aca05f1893fdb694269344
GIT binary patch
literal 1283
zcmd^<=Tq7T7{`A$y-Uts#w9P(w2i&AP10P>HnwMbn&xbcp0zbLQPaA?y|<`{0*VSE
zE>wm%P!wE<3%4jvP*D+afXHy+-g}k4%m2{l?)yC7=iPJP``nZK*3#^z_Gj7v0NgbH
z-NZ^W@BF75*EIcG-P_gxa1D5CVPmQjsn1Goh=_<#tJF>@KI5DT7z<<R^sa)-%CI5E
zAi_#gO9pENdPvi&tE<-0&apWW9aQrK@hX=?3vaSD!r8D`WqfHjfsB?)BswXEN%i>s
z{e7Y}6^({V__Am5MhrR~ObwDRD4GczelM>G!uS*K_yzJOyepBxWyTUvy<%QQdtL$!
zr-L$p2SS~R0ZPUAkaV<~&u(P14=xS}b_L1}+2-cvLzq6rfhMRIs^(PkF=h8q@A1*m
zBb1?j;velr9PfOH1qB?RmWT?4XZ=l~SkrNJId-|e9pl}jEkfn;d{S8&$-Yn*X<Wx|
zB5{jL%S#m^m0(s_3@Nv@wY9Uev$wZ*aBy&RbaZlZa&~qGfk0p|*u}-g)z#I_&CT82
z-NVDf)6>(-%gfu_+sDVp*Vot2&(GiAKOi6=FfcGEC@45MI3y$_G&D3UEG#@c90Gx8
zvW<+4jEahaLZQ*o(J&Y+CMG5}HWm(tBM=BA5*Zg47at#wLZK285)u;=lai9qXfy_c
zNls42VzDVHDL5Q1H8nLYEiFAgJtHF{Gcyy9$7f|_WoKvS<m3<t1R{}0B9X{sa&B%e
zg+j^8%gfKtFDNJ|EG(o_sYOLa#l^)m8m*+Hq_nh@PNy>%jIy$_^78VEii*n0%Brd=
zCX-oRUCm;#YHDg~YisN3>gwz38yXteY<6Q~V^dR8b8~Y`OG|5OYg=1edwY9FM+b+)
z>Fn(6>gwWhx!v8}Jv}|Wy}f;Xef|CY0|Ns*9*@uG4-O6v4Gj$s4+{i>k&%(n(b2K7
zF`-a6K0YoIi6$l{#A5N}<mA-U)b#Z9%*>2LB9Tg^v$L}@nQU%uPA-=#6bhwMsZy!t
z=jRs|78Vy5mzI{6mzULQ^~%c1>gwv++S>a1`o_kF29K?+t?ljYot>TC-QB&tJq?Ek
z2M33Thet<8$H&JfCnu+;r)Otp=jZ1a7Z;b8ml~wW3i~_&&;r7(EUh)`2L*iK{}&eE
zwV-=6@1f4z<Tslr$@{;=cR$j*^L(?9*?eF3yI1SCUMhmmu8fMh^s;~Xrj5*Zzu$Gc
zwZeFNiTZuud@2X>9wd)?eJ^YA`j-z5-BU8e7r32w!OI)8!c4UQ`%)hdt(5_<-_S*q
zTI$a!RvsT;*HUBsABWr;`Rb9)4`yKj*c(r@G0`umpIR6`wRlE<0DOXZQxfsm-|ViR
z!Pf~GTT27dlbnB;KW=~=33QlPEkkS}UsPS35qj=Dg+4qH{`~w`&Gmq}sijG^F*yET
Dt?N}f

literal 0
HcmV?d00001

diff --git a/eu.etaxonomy.taxeditor.application/plugin.xml b/eu.etaxonomy.taxeditor.application/plugin.xml
index ad4eea38e..ff3de6627 100644
--- a/eu.etaxonomy.taxeditor.application/plugin.xml
+++ b/eu.etaxonomy.taxeditor.application/plugin.xml
@@ -38,7 +38,7 @@
       </perspective>
       <perspective
             class="eu.etaxonomy.taxeditor.perspective.DerivatePerspective"
-            icon="icons/specimen_derivate-16x16-32.gif"
+            icon="icons/specimen_derivate-16x16-32.png"
             id="eu.etaxonomy.taxeditor.application.perspective.derivates"
             name="Derivates">
       </perspective>
diff --git a/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/dataimport/transientServices/TransientOccurenceService.java b/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/dataimport/transientServices/TransientOccurenceService.java
index 83f1f6619..768481d3b 100644
--- a/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/dataimport/transientServices/TransientOccurenceService.java
+++ b/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/dataimport/transientServices/TransientOccurenceService.java
@@ -857,4 +857,12 @@ public class TransientOccurenceService implements IOccurrenceService {
         return units;
     }
 
+    /* (non-Javadoc)
+     * @see eu.etaxonomy.cdm.api.service.IOccurrenceService#getFieldUnits(eu.etaxonomy.cdm.model.occurrence.DerivedUnit)
+     */
+    @Override
+    public Collection<FieldUnit> getFieldUnits(DerivedUnit derivedUnit) {
+        return defaultService.getFieldUnits(derivedUnit);
+    }
+
 }
diff --git a/eu.etaxonomy.taxeditor.editor/icons/derivate_view-16x16-32.png b/eu.etaxonomy.taxeditor.editor/icons/derivate_view-16x16-32.png
new file mode 100644
index 0000000000000000000000000000000000000000..85c30a804b4c718082e2b72c23f540cf2e1b516c
GIT binary patch
literal 1211
zcmd^<)laMk5XHY6nx>bQmWSr1!QI_m7udyF7I$}F+}(YF#ogWA-Q5;<clUlx)4!sV
z%$ze%^KgEda7B439Be#n003}cPzW4U+<*EPEO62={-F#2Sb(A|LP9`*e`I7hEG+c)
z_O_&?*vQCmZ*LEUN^EGT|NQ(!Ae3!vtkLL{mX_x8^Yg{UMJQAXiF8a)Pmhj{YHx4X
z($buqoGdFVwYRsEmWJWs;o;-s6A%y(5)u*-5fKv;laP>*l9G~<k&%;=Q&3P)Qc_Y;
zQBhM<)6me+($dn=(b3b>GcYhPGBPqTF)=eUv#_wRva+(Vv9YtWb8v8Qa&mHUadC5V
z^YHNS^78WW@$vKX3kV1Z3JMAd2?+}ei-?Gbii(PfiHVDgLm&_d2?<F_Nhv8QC=?2V
z!K9_7Wn^SzWo6~$<mBb$6%-T{6&00~l;Ci<va&J)flyIVQB_q{Q&Uq{SJ%+c(A3n_
z($dn_*4EL{(bd(})6>(}*EcXQFf=qYGBPqYHa0OaF*P+cGcz+cH@C2`u(Y(ava+(a
zwzjdcv9-0ev$M0ew|8)GaCCHZa&kf<k<QM}E-o&vuC8uwZtm{x9v&W^o}OM_Uf$l`
zK0ZFazP^5be*XUc0RaJlfq_9mLBYYnAt525p`l@6Vd3H75fKrQk&#hRQPI)SF)=Z*
zv9WP+aq;o-2?+^_iHRr_Dk&)`IXO8cB?XN}r>3T+rKN$<WMpJyW@ct(Wo2h)=j7z%
z=H}+*<>lw+7Zel}78Vv26%`j3mz0#0mX?;4m6ey5S5#C~R#sM3RaIA4*VNS1*4Eb5
z)z#P6H#9UfHa0djH8nRkx3sjhwzjslwSl2`baZrfc6N1jb$567^z`)h_V)Gl_4oG=
z3=9ko4h{_s4G#~GjEszqj*g9ujgOB{OiX}~OifKqPfyRx%*@Wt&dtru&(AL`EPzBU
zEiElCFR!eutgfzNFqpNqwe|J&jg5`X&CRW?t?ljYot>TC-CYpN{r&xegM-7v!=t04
z<KyF#latfa)3dWPkj#sVi_6Q)tE;Q)>+74F8xZEZySw}Q`-g{z$H&K~r>E!V=a-k4
z*Vos#x3~BA_m7Vc5bv+AubUa|BmnpZAmQ@L;QDU?|C#@j0$&Q1hQZ)_u!KQG5pEdg
z*tOsNNPZJnLir!tYePQ2q$nl7;|j)3Vj5+gYZUxFU;6BNsh<G1U*}YR{3)hh^3x3D
zd)v$;Etb{K)}w#Xnif5KtqvPwh<t=lIK@<6>3w3>A_MSD{KQxcBQDb9MbGnF?kG0e
T?V21Pyb8c1<RMjJ`T>6fv8w0v

literal 0
HcmV?d00001

diff --git a/eu.etaxonomy.taxeditor.editor/plugin.xml b/eu.etaxonomy.taxeditor.editor/plugin.xml
index a02e50e30..5883a846f 100644
--- a/eu.etaxonomy.taxeditor.editor/plugin.xml
+++ b/eu.etaxonomy.taxeditor.editor/plugin.xml
@@ -61,6 +61,7 @@
       <editor
             class="eu.etaxonomy.taxeditor.editor.view.derivate.DerivateView"
             default="false"
+            icon="icons/derivate_view-16x16-32.png"
             id="eu.etaxonomy.taxeditor.editor.view.derivate.DerivateView"
             name="Derivate View">
       </editor>
diff --git a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/EditorUtil.java b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/EditorUtil.java
index 6c64cb95a..22faa208a 100644
--- a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/EditorUtil.java
+++ b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/EditorUtil.java
@@ -26,6 +26,7 @@ import org.eclipse.ui.IEditorReference;
 import org.eclipse.ui.PartInitException;
 import org.eclipse.ui.handlers.HandlerUtil;
 
+import eu.etaxonomy.cdm.model.common.CdmBase;
 import eu.etaxonomy.cdm.model.occurrence.DerivedUnit;
 import eu.etaxonomy.cdm.model.occurrence.FieldUnit;
 import eu.etaxonomy.cdm.model.occurrence.SpecimenOrObservationBase;
@@ -353,7 +354,7 @@ public class EditorUtil extends AbstractUtility {
         if(specimen.isInstanceOf(FieldUnit.class)){
             return (FieldUnit) specimen;
         }
-        else if(specimen.isInstanceOf(DerivedUnit.class) && ((DerivedUnit) specimen).getOriginals()!=null){
+        else if(specimen instanceof DerivedUnit && ((DerivedUnit) specimen).getOriginals()!=null){
             for(SpecimenOrObservationBase original:((DerivedUnit) specimen).getOriginals()){
                 if(original.isInstanceOf(FieldUnit.class)){
                     return (FieldUnit) original;
diff --git a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/handler/OpenDerivateViewHandler.java b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/handler/OpenDerivateViewHandler.java
index c322cfcd0..118c671b8 100644
--- a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/handler/OpenDerivateViewHandler.java
+++ b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/handler/OpenDerivateViewHandler.java
@@ -8,7 +8,6 @@ import org.eclipse.jface.viewers.IStructuredSelection;
 import org.eclipse.ui.PartInitException;
 import org.eclipse.ui.handlers.HandlerUtil;
 
-import eu.etaxonomy.cdm.model.occurrence.FieldUnit;
 import eu.etaxonomy.cdm.model.occurrence.SpecimenOrObservationBase;
 import eu.etaxonomy.taxeditor.editor.EditorUtil;
 import eu.etaxonomy.taxeditor.editor.view.derivate.DerivateViewEditorInput;
@@ -25,12 +24,8 @@ public class OpenDerivateViewHandler extends AbstractHandler {
         if(currentSelection instanceof IStructuredSelection){
             Object selectedElement = ((IStructuredSelection) currentSelection).getFirstElement();
             if(selectedElement instanceof SpecimenOrObservationBase<?>){
-                FieldUnit fieldUnit = EditorUtil.getFieldUnit((SpecimenOrObservationBase<?>) selectedElement);
-                if(fieldUnit==null){
-                    AbstractUtility.errorDialog("Failed to open Editor", OpenDerivateViewHandler.class, "Could not open DerivateView. The derivate hierarchy is corrupted!");
-                    return null;
-                }
-                DerivateViewEditorInput input = new DerivateViewEditorInput(fieldUnit);
+
+                DerivateViewEditorInput input = new DerivateViewEditorInput((SpecimenOrObservationBase<?>) selectedElement);
                 try {
                     EditorUtil.open(input);
                 } catch (PartInitException e) {
diff --git a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/derivate/DerivateContentProvider.java b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/derivate/DerivateContentProvider.java
index bee0847cd..207471637 100644
--- a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/derivate/DerivateContentProvider.java
+++ b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/derivate/DerivateContentProvider.java
@@ -28,20 +28,20 @@ public class DerivateContentProvider implements ITreeContentProvider {
 
 	@Override
 	public Object[] getElements(Object inputElement) {
-	    FieldUnit fieldUnit = null;
+	    SpecimenOrObservationBase<?> specimen = null;
 	    if(inputElement instanceof DerivateViewEditorInput){
-	        fieldUnit = ((DerivateViewEditorInput) inputElement).getFieldUnit();
+	        inputElement = ((DerivateViewEditorInput) inputElement).getDerivate();
 	    }
+
 	    // return the parent FieldUnit if element is a DerivedUnit
-	    else if(inputElement instanceof DerivedUnit){
-	        fieldUnit = EditorUtil.getFieldUnit((DerivedUnit)inputElement);
+	    if(inputElement instanceof DerivedUnit){
+	        specimen = EditorUtil.getFieldUnit((DerivedUnit)inputElement);
 	    }
 	    else if(inputElement instanceof FieldUnit){
-	        fieldUnit = (FieldUnit) inputElement;
-//	        fieldUnit.getTitleCache();
+	        specimen = (FieldUnit) inputElement;
 	    }
-	    if(fieldUnit!=null){
-	        return Collections.singleton(fieldUnit).toArray();
+	    if(specimen!=null){
+	        return Collections.singleton(specimen).toArray();
 	    }
 	    else {
 	        return Collections.EMPTY_LIST.toArray();
@@ -51,8 +51,9 @@ public class DerivateContentProvider implements ITreeContentProvider {
 	@Override
 	public Object[] getChildren(Object parentElement) {
         if(parentElement instanceof DerivateViewEditorInput){
-            parentElement = ((DerivateViewEditorInput) parentElement).getFieldUnit();
+            parentElement = ((DerivateViewEditorInput) parentElement).getDerivate();
 	    }
+
 	    if(parentElement instanceof SpecimenOrObservationBase){
 	        return getDerivates((SpecimenOrObservationBase) parentElement).toArray();
 	    }
@@ -62,9 +63,13 @@ public class DerivateContentProvider implements ITreeContentProvider {
 	@Override
 	public Object getParent(Object element) {
         if(element instanceof DerivateViewEditorInput){
-            element = ((DerivateViewEditorInput) element).getFieldUnit();
+            element = ((DerivateViewEditorInput) element).getDerivate();
 	    }
-	    if(element instanceof DerivedUnit){
+
+        if(element instanceof FieldUnit){
+            return element;
+        }
+        else if(element instanceof DerivedUnit){
 	        DerivedUnit derivedUnit = (DerivedUnit)element;
 	        return derivedUnit.getOriginalUnit();
 	    }
@@ -74,8 +79,9 @@ public class DerivateContentProvider implements ITreeContentProvider {
 	@Override
 	public boolean hasChildren(Object element) {
         if(element instanceof DerivateViewEditorInput){
-            element = ((DerivateViewEditorInput) element).getFieldUnit();
+            element = ((DerivateViewEditorInput) element).getDerivate();
 	    }
+
 	    if(element instanceof SpecimenOrObservationBase){
 	        SpecimenOrObservationBase specimenOrObservation = (SpecimenOrObservationBase)element;
 	        for(DerivationEvent event:(Set<DerivationEvent>)specimenOrObservation.getDerivationEvents()){
diff --git a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/derivate/DerivateView.java b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/derivate/DerivateView.java
index ba4c5a84c..806d730b6 100644
--- a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/derivate/DerivateView.java
+++ b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/derivate/DerivateView.java
@@ -19,6 +19,7 @@ import org.eclipse.ui.part.EditorPart;
 import eu.etaxonomy.cdm.api.conversation.ConversationHolder;
 import eu.etaxonomy.cdm.api.conversation.IConversationEnabled;
 import eu.etaxonomy.cdm.model.occurrence.FieldUnit;
+import eu.etaxonomy.cdm.model.occurrence.SpecimenOrObservationBase;
 import eu.etaxonomy.cdm.persistence.hibernate.CdmDataChangeMap;
 import eu.etaxonomy.taxeditor.model.IDirtyMarkableSelectionProvider;
 import eu.etaxonomy.taxeditor.model.IPartContentHasDetails;
@@ -67,9 +68,10 @@ public class DerivateView extends EditorPart implements IPartContentHasFactualDa
         IEditorInput editorInput = getEditorInput();
         viewer.setInput(editorInput);
         if(editorInput instanceof DerivateViewEditorInput){
+            SpecimenOrObservationBase<?> specimen = ((DerivateViewEditorInput) editorInput).getDerivate();
             FieldUnit fieldUnit = ((DerivateViewEditorInput) editorInput).getFieldUnit();
             setPartName(fieldUnit.toString());
-            viewer.setSelection(new StructuredSelection(fieldUnit));
+            viewer.setSelection(new StructuredSelection(specimen));
         }
     }
 
diff --git a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/derivate/DerivateViewEditorInput.java b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/derivate/DerivateViewEditorInput.java
index 4e534e30a..bed369ad3 100644
--- a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/derivate/DerivateViewEditorInput.java
+++ b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/derivate/DerivateViewEditorInput.java
@@ -9,25 +9,59 @@
 */
 package eu.etaxonomy.taxeditor.editor.view.derivate;
 
+import java.util.Collection;
+
 import org.eclipse.jface.resource.ImageDescriptor;
 import org.eclipse.ui.IEditorInput;
 import org.eclipse.ui.IPersistableElement;
 
+import eu.etaxonomy.cdm.model.occurrence.DerivedUnit;
 import eu.etaxonomy.cdm.model.occurrence.FieldUnit;
+import eu.etaxonomy.cdm.model.occurrence.SpecimenOrObservationBase;
+import eu.etaxonomy.taxeditor.model.AbstractUtility;
+import eu.etaxonomy.taxeditor.store.CdmStore;
 
 /**
+ * Editor input for the {@link DerivateView} which holds the currently selected derivate for which
+ * the derivate hierarchy should be shown in the DerivateView.<br>
+ * It also holds a {@link FieldUnit} which is the root of the hierarchy. (both may be the same object)
  * @author pplitzner
  * @date 25.11.2013
  *
  */
 public class DerivateViewEditorInput implements IEditorInput {
 
-    private final FieldUnit fieldUnit;
+    /**
+     * The selected derivate
+     */
+    private final SpecimenOrObservationBase<?> derivate;
+    /**
+     * The root of the hierarchy (may be the same object as the derivate)
+     */
+    private FieldUnit fieldUnit;
 
-    public DerivateViewEditorInput(FieldUnit fieldUnit) {
-        //TODO: add current selection to constructor to highlight it in DerivateView
+    /**
+     * Creates an editor input for the {@link DerivateView} with the currently selected derivate and the
+     * corresponding {@link FieldUnit} (both may be the same object).
+     * @param derivate the derivate for which the derivate hierarchy should be shown
+     * @param fieldUnit the root of the hierarchy
+     */
+    public DerivateViewEditorInput(SpecimenOrObservationBase<?> derivate) {
         super();
-        this.fieldUnit = fieldUnit;
+        this.derivate = derivate;
+        if(derivate instanceof FieldUnit){
+            this.fieldUnit = (FieldUnit) derivate;
+        }
+        else if(derivate instanceof DerivedUnit){
+            Collection<FieldUnit> fieldUnits = CdmStore.getCurrentApplicationConfiguration().getOccurrenceService().getFieldUnits((DerivedUnit) derivate);
+            if(!fieldUnits.isEmpty()){
+                // TODO think about handling multiple parent FieldUnits
+                this.fieldUnit = fieldUnits.iterator().next();
+            }
+        }
+        if(fieldUnit==null){
+            AbstractUtility.errorDialog("Failed initializing editor", DerivateViewEditorInput.class, "No FieldUnit found!");
+        }
     }
 
     /* (non-Javadoc)
@@ -61,7 +95,7 @@ public class DerivateViewEditorInput implements IEditorInput {
      */
     @Override
     public String getName() {
-        return fieldUnit.toString();
+        return derivate.toString();
     }
 
     /* (non-Javadoc)
@@ -77,7 +111,15 @@ public class DerivateViewEditorInput implements IEditorInput {
      */
     @Override
     public String getToolTipText() {
-        return fieldUnit.toString();
+        return derivate.toString();
+    }
+
+
+    /**
+     * @return the specimen
+     */
+    public SpecimenOrObservationBase<?> getDerivate() {
+        return derivate;
     }
 
     /**
diff --git a/eu.etaxonomy.taxeditor.store/icons/artwork_derivate-16x16-32.gif b/eu.etaxonomy.taxeditor.store/icons/artwork_derivate-16x16-32.gif
deleted file mode 100644
index ee8009a332385796cdf6e198c72ae3aa207c18ec..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1022
zcmV<a0|ER;Nk%w1VGsZi0CxZYA^!_bMO0HmK~P09E-(WD0000X`2+|G0000i00000
z5C9MWhc#sz-sR{HZlO)5C!9T!-VzPK#W|v)u7DR6%Gtul#8`tjd$*Lcd#h+!KvYqj
z!?CimwnajoodoUu{nXGK42{ulY$rruZ*-@*-iwUJvBscso6{W_Vwg)JjmG2N2*qV#
zVrFLC(%bRt@Om*Ym$}Lwn%nFm9n+qiugB7lJce4eGs?($gO`il!omLf_iT52q`;Tu
z;1#^iwB_8~ZcI*<Q;q)q{`~gx)hQ%pq{PeG+M`aI$HU7_uOsvB4(#mg+Se-Y_V#&o
zX)UGY>j?v3QeM5Fx~PJrg098Q$~lfKgHxo_F_Xv7Z){+|H{#*e^z-_<!N=I$)%715
z6^_nQq%X|Mhu7WIWTi;y<rSg7&QYo>`S$wI+02wXizlAl$izY1*B7cyprA&V5|Y*F
z@an;nuh<w9^Yrxg`Tk{TZZT{Z>*gBSBp>DE+UVm7g*Spyuqo&zAk4taRHrb=u*FWM
zD0p~yd3kwydU|_%dwhI+eSLj?etv&{e}I61fq{X7f`WsCgM@^Hg@uKNhK7fShlq%X
ziHV7dii(Sii;Rqnjg5_tj*gFykC2d%k&%&-l9H2?la!Q{m6es2mX?>7mzbECnVFfI
znwp!No1C1Sot>SYo}QndpP-<ip`oFoqN1atqokyyrKP2&rlzN-r>Ll?si~=|s;aB2
ztE{Z7t*x!DuCA}IuduMNv9YnTva++Yv$V9dwY9ajwzjvox45{txw*Nzy1Ki&yS%)-
zy}iA@zP`V|zreu2!NI}8!otJD!^FhI#l^+O#>U6T$H>UY$;rve%F4^j%goHo&CSiu
z&d$%z&(P4&(b3V;($dq@)6~?|)z#J3*4Ee8*Vx$D+1c6J+S=RO+uYpT-QC^Z-rnEe
z-{9cj;o;%p;^O1u<K*Pz<>lq(=H}<;=jiC@>FMd}>gwz3>+J08?d|RE?(XmJ@9^;O
z@$vEU^78ZZ^Yrxe_4W1k_V)Mp_xSku`T6<!`uh9(`~3X;{r&y^{{H{}{|LwcZwMSX
z5J!m=1aFKuA|j!VGELGDWU%B55{WmGlmXKO2thkvczoG#BY+1mCLX*Xn8pSf9t6%{
zs6eF3mV`Ixs2H=r0gMX*nBWwsA&wC<H*l<JkpN4SglUFA7$^dO94lF3NCd(nh=c<J
zd$4)3Vug<eP?UUVBg2A}2|Ge`sB>okmj+>ew9x{`Kn)TIBB+@%V}_S53dB%Qaz#jn
sB2?VaNEijmo2NHW6qtj?#ZZDYIGpJGnV^#*IXspY2m}NQoB;s<J7{oGWB>pF

diff --git a/eu.etaxonomy.taxeditor.store/icons/derivate_search_view-16x16-32.png b/eu.etaxonomy.taxeditor.store/icons/derivate_search_view-16x16-32.png
new file mode 100644
index 0000000000000000000000000000000000000000..d8f62c3c2df47ff010d6e35c6168af60dc92e792
GIT binary patch
literal 1279
zcmd^9)l=gK5dK~7Dnom7Tsytav@d;VJM9d;xjx`Q0tpZx5E9(oJ;6PKh6Hza4U*sq
zPOt#M-3b;f!8QH$?f!@E%<g{swBPQ2vvDXL^|xX_iva-e7NG${gIWAP|K>Fq|NQ$M
z1^`|IC~bW>L|(4Br!NdoTs=O`DX+A%wdFs)EG#TkG1|z~Bz*$|EY^2NaLpX$yu7^d
zczeY7M1kO3TU&c@X1<ixl#`d|=I+kj*lB5L;q&<%&Nwb8*woB)|N0?4J*~8~6b^@9
ziA1q6F>YSoEEaQUXmE9Pl|aCUgalJEv&rOy`noz}Bg57KHm#Fs@9aWOO`F~3)wFha
z`uGZk0!c|pDJdywX=xc58Ch9bIXO9bd3gu~qM)FlsHmu<q@=8@4242fR8&+|Rbem~
z*iKDNO<i4GLqh|BKxk@eYH4YKY>`N$j*gD5t}Y6N($mvJqtO@)MqeMC&%n^o(8$Qh
z*x1;_#KhFp)XdDx+}zy4!ot$h(#p!p+S=O2#>Upx*3Qn(-rnB9!NJkd(aFil+1c5}
z#l_Xt)y)lDfV+o>ho`5fmzS5fx3`avkFT#U7K_E<aDIM%{{H>}0Re%5fk8n*!NI{H
zAt9lmp<!WR;o;#C5fPD*kx@}mcs!m!AP|W}5{VQY9UT)B6B`>F7Z(>FAD@trKqiwD
z6B8*E3YAJtN=iyjPEJWlNli^nOG`^nPtVB6$jr>l%F4>l&d$ln$<58p%gf8p&o3w_
zC@d^2Dk>^2E-oo40dG-OR#skKUQtm|Sy@?CRaISGT~kw2TU%RKS65$OPovQq8X6iK
z8=IP%nwy*HbUK5<0MFXm+S=CE*52OU(b3V_+1b_A#bh#BELL}ScTZ1GZ*Om3UtfQJ
z|G>b&;NalU&=8x=9v&VZ85tQJ9UU7R8y_F%a5xha6O)sZQ&Ur1E_Zr*dS+&3c6N4d
zZf<^l9u(W+;^NZM((>~1%E}5TkF~Y6_4W0Qjg8IC&8@Ai?d|QIot@p?-Mzg%9*?)b
zzkhIWaCmrlbaZrld<?4Y<mBY^^z`iP?EL)v;^IOe5D10B%gf8FtE=nl>zkXK+uPf_
zySw}Q`-g{z$H&K~r>E!VXHd@~kw`*j{15<M0XVb{1}r}_;4}PxfPl!qFdYKE2O0tf
z)el^8pz^=R|0+(B#C-dgSgJUZf&Olm$r8~?OH11MN?n(y1^IOLi#pp}{M{Fn51%YY
zOI=o=vCZ7bb%|QOgxgk7RTRYGr{9MU#`<Lr%KZQEjxzgF_?yNDZa8HO>3@c#pV{rW
zqTt+3=pn;>?w8_3BmPIi*VLxnH*Y9DPw~L}@=3k&e?Fe;u3BT!#8&{x^#>}t22TPi
laXB3-nzANITcXYI>#t^Keyn)EsNWAV2M}-_7)`|*|1Xa;Iu`%{

literal 0
HcmV?d00001

diff --git a/eu.etaxonomy.taxeditor.store/icons/dna_derivate-16x16-32.gif b/eu.etaxonomy.taxeditor.store/icons/dna_derivate-16x16-32.gif
deleted file mode 100644
index a186f0018076d8082fc12450483d228b33f1b400..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 992
zcmV<610VcHNk%w1VGsZi0CxZYA^!_bMO0HmK~P09E-(WD0000X`2+|G0000i00000
z5C9MWhXMitsHmq{SXboa<S8j9e0+MpzrOVJ^gcd3n3$In6A^B1ZQb47NJvNi{{D`R
zjm^!>Wo2Xy4GS?bFSE0=?Ck3t92$g#gQ20IMMXnUP)~GpbCQyg(9qB|H8WdVT1`z%
zAt4`#h=-h<n=LIXsi~<rI5xt<!EteKQc_VWDk>{0D=aK5EiElBE-o)GFEB7LF)=YR
zGBPtWGc+_bH8nLhHa0gmH#j&rIXO8xIyyT$J3Kr*Jv}`>K0ZG`KR`f0K|w)6LPA4B
zLqtSGMMXtMMn*?RM@UFWNl8gcN=i#hOH52mO-)TsPEJoxPf$=$QBhG+Qc_b>Q&dz`
zRaI41R#sP6S6EnBSy@?HT3TCMTU=aRU0q#XUS3~cUtnNhVPRonVq#-sV`OAxWo2b%
zW@cw+XJ}|>X=!O{YHDk1Yiw+6ZEbCCZf<XHZ*XvMadB~Sa&mKXb98icb#--ic6N7n
zcX)Vsd3kwydU|_%dwhI+eSLj?etv&{e}I61fq{X7f`WsCgM@^Hg@uKNhK7fShlq%X
ziHV7dii(Sii;Rqnjg5_tj*gFykC2d%k&%&-l9H2?la!Q{m6es2mX?>7mzbECnVFfI
znwp!No1C1Sot>SYo}QndpP-<ip`oFoqN1atqokyyrKP2&rlzN-r>Ll?si~=|s;aB2
ztE{Z7t*x!DuCA}IuduMNv9YnTva++Yv$V9dwY9ajwzjvox45{txw*Nzy1Ki&yS%)-
zy}iA@zP`V|zreu2!NI}8!otJD!^FhI#l^+O#>U6T$H>UY$;rve%F4^j%goHo&CSiu
z&d$%z&(P4&(b3V;($dq@)6~?|)z#J3*4Ee8*Vx$D+1c6J+S=RO+uYpT-QC^Z-rnEe
z-{9cj;o;%p;^O1u<K*Pz<>lq(=H}<;=jiC@>FMd}>gwz3>+J08?d|RE?(XmJ@9^;O
z@$vEU^78ZZ^Yrxe_4W1k_V)Mp_xSku`T6<!`uh9(`~3X;{r&y^{{H{}{|Kr89S9sK
z@W6%$6$mOE7y-bAgbN9t0AK+^M1>znoFHNGqCgK592g)mz@vi<5+XPlVZs3h3IZ8C
zcwiAii3kfEi1-i!go6$i0D!n~p<{{>4oCo?aKHnB2O16xcz}Y#0|gc&JaF&;zz3HI
z4mcQ4VuJt_9Z4YgaKS->3=RT(RagQh0;CTj6p$b`VucAXHwZO3paBOG6+JT8fB*mj
O282I=7}0lOKma>1zvu`6

diff --git a/eu.etaxonomy.taxeditor.store/icons/dna_derivate-16x16-32.png b/eu.etaxonomy.taxeditor.store/icons/dna_derivate-16x16-32.png
new file mode 100644
index 0000000000000000000000000000000000000000..f80d8dc57401d283e5a5e70fdb9b78ec84b337e5
GIT binary patch
literal 1262
zcmd^<)l;Jf6ve+~r_+U&E?wSsm?_)NPKyK&?hqglLI?qZ2X_es_aMRD32wpNHMqOG
zYjF3bZ~H&=&fI&>eY-Q~H#Zakm#3%uN(TS{Jyby!NmYjb`qM}1{0H<|4FEm@2p9@N
zL-T<|Dng?*cXxMLSpN3%^62dBxVgCz7Z*)QNoHjH-OkQ-ZEa0KLH_OSEh;K<Y;4rj
z)P$b?7jACO+S*zQ<%EgpYhYkNPEIxiB7;Dv;BZcHaj}z=lVC8fj*hmnGVI&8KSDwX
zL}EG!#8zBfEGWp|-A%?~?U6`TR#sLvHa2#4b`S`}!NI}F$;rjV#m&vl!^6YN%ge{d
z2L^-r`S}F|1Ox>Ig@lBJg@r{#L_|eJ#l*zK#l<BgBqSvzrKF^!rKM$LWMpM!ArOe1
zoSeM8yn=!P6be;TR8&$@g27<Q%F1v!Tt!6%fk3FLsv?m{H8nL93Z<^DuA!l!si}!Z
zqqVfOw6(Q$baZreb@lZ0^!4=(3=A+BjG>{Sk&%(Hv9XDXiK(fnnVFfnxw(afg{7sX
zm6esXwY80njjgS%ot>S%y}g5j0~U*QbaZrba>C(o&d$y*E-tRFu5NB_?(Xg$9v+^a
zo?c#F-rn9mK0dy_zJ7jw{{H@WJU$>GATTg6C@3g6IG8{ngoK2IhK7cPg@uQQM?^$K
zMn*<OMMXzP$Hc_M#>U3Q#l^?RCnO{!CMG5&B_$^(r=+B$rlzK)rKP8*6N$u(jEv08
z%&e@e?Ck8EoSfX;+`PQJ{QUfaf`Y=r!lI%g5{X33qNJpxw6wIWtgO7eyrQC_va+(O
zs;auWx~8Uv8g5-(U44ChLqkJjV`EcOQ*(23OG`^@YinCuTYGzZM@L6zXJ=Pe7nw}%
z?(XjC>FMq5?d$97@9!TN7#JKJ92y!L9v&VU85tcN9UB`PA0MBXn4p3&H8nLoJv}os
zGdnvwH#avwKfkcBu(-Imw6wImyu7lqvbwrTMQ(k4ePd%|b8~ZRYioOZduL~dis;_n
z-v0jn!NI}d;o;HI(ed%|$;k<YLODG>Jv%!)KR>^?xVXH$yt=x&zP_ene0zI)cXxMx
zfB*3C@c8)n^z`)n{QUCr^7{Hp<@x>nUGzbk82~;2I3!$+y8ckW5B~pPfp?dzL{aK{
z$bia9q1=|$Cr-ZLnHhfC1hJAR!1`oWc30iKFS(4*_MI{+&?;h1Ym6-ocP*mjOO-ez
zq0snnJ(N<D*&?LDPk8RrXVfDQnm|`FC%?Kj#>nyA-8lHwTr!{d;QZGFai}Afz>~-f
z{Vj15Q?7U4!vxv-^$x6Y=9#g~^rz&p?XWL7jGgd3T8KpijD@}V_tJf#HN%YmEbjeE
X^K{A3cT?H&L_HLMLg2C$(ir@|LyrqC

literal 0
HcmV?d00001

diff --git a/eu.etaxonomy.taxeditor.store/icons/fieldunit-16x16-32.gif b/eu.etaxonomy.taxeditor.store/icons/fieldunit-16x16-32.gif
deleted file mode 100644
index 2c2aaf357421b88a1cf7365cfa399eb29b21ce5d..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 977
zcmV;?11|hWNk%w1VGsZi0CxZYA^!_bMO0HmK~P09E-(WD0000X`2+|G0000i00000
z5C9MWhXn-#w6wEfVPEU(>xznrJv}?r)YKmz9d~zj{{H@(o0?5cOW@$&uCA@d#>H-K
zZGeD(+S=MgL_&~|kMr~MprD^CD=Ai1ReO7TzrViB%*#nhM<pdAq@<&hlauA;<z!@I
zSy@;J2nK_Lf>BXVaByz0u&*a4CnzW=DJdx`Dk>{0D=aK5EiElBE-o)GFEB7LF)=YR
zGBPtWGc+_bH8nLhHa0gmH#j&rIXO8xIyyT$J3Kr*Jv}`>K0ZG`KR`f0K|w)6LPA4B
zLqtSGMMXtMMn*?RM@UFWNl8gcN=i#hOH52mO-)TsPEJoxPf$=$QBhG+Qc_b>Q&dz`
zRaI41R#sP6S6EnBSy@?HT3TCMTU=aRU0q#XUS3~cUtnNhVPRonVq#-sV`OAxWo2b%
zW@cw+XJ}|>X=!O{YHDk1Yiw+6ZEbCCZf<XHZ*XvMadB~Sa&mKXb98icb#--ic6N7n
zcX)Vsd3kwydU|_%dwhI+eSLj?etv&{e}I61fq{X7f`WsCgM@^Hg@uKNhK7fShlq%X
ziHV7dii(Sii;Rqnjg5_tj*gFykC2d%k&%&-l9H2?la!Q{m6es2mX?>7mzbECnVFfI
znwp!No1C1Sot>SYo}QndpP-<ip`oFoqN1atqokyyrKP2&rlzN-r>Ll?si~=|s;aB2
ztE{Z7t*x!DuCA}IuduMNv9YnTva++Yv$V9dwY9ajwzjvox45{txw*Nzy1Ki&yS%)-
zy}iA@zP`V|zreu2!NI}8!otJD!^FhI#l^+O#>U6T$H>UY$;rve%F4^j%goHo&CSiu
z&d$%z&(P4&(b3V;($dq@)6~?|)z#J3*4Ee8*Vx$D+1c6J+S=RO+uYpT-QC^Z-rnEe
z-{9cj;o;%p;^O1u<K*Pz<>lq(=H}<;=jiC@>FMd}>gwz3>+J08?d|RE?(XmJ@9^;O
z@$vEU^78ZZ^Yrxe_4W1k_V)Mp_xSku`T6<!`uh9(`~3X;{r&y^{{H{}{|K7^69^ob
zAi@WN2oX*Qkg#C_0T>(#bZ{`ig9`!;Fi2=XLW2PwEDY!nf<nU#8zhVXfT4f^hY=81
z=+J=!hyesOcmN@R1AqzwD|qmL;DHAN8VEeVpa25|fe-*#SWu!ugn<+y6ySgX!vO*~
z8+y2aL4*Pl8#FXDaKS(X4jm|%xKNQ`1d|C=3LJ1%B8Z3*2`cCi*lu5h0RaFzXm;t4

diff --git a/eu.etaxonomy.taxeditor.store/icons/fieldunit-16x16-32.png b/eu.etaxonomy.taxeditor.store/icons/fieldunit-16x16-32.png
new file mode 100644
index 0000000000000000000000000000000000000000..956897e990719a4151b19f1f2aa7000728e4d194
GIT binary patch
literal 1249
zcmd^<^-tpm7{<F0w#(hfEtl<<TXMNf2<|RL3#E8V3lyigw76R-?#12Rt+*Ap;_k)W
zUAynH?626Hyzle8zrA_#$s4Aw3T1fz+j|fQ!~j!(AOQX8pMFONOlFRc8XyoINL?8z
zM^8^jBGnrk8y+7YhlhuO!D6$sv){gbb#rrldwWYyPg7A*qEa`iswxKt`f)fc9`Coj
zybOWJ5Q#C@*Vj2Y*=%eqnwlstFR!kyP6}ld27@v({#j6vA0HpTySr;@YJx^<zkBz6
zKmY*_SF^Xr)znloF)=YSGqbR;u(GnUv9YnUvvY88aB^~TadB~TbMx@<@bdEV@$vEV
z^9u+F2nq@c2?+@c3yX+|h>D7eiHV7ei-W;n2?+^FNl7UwDQRhG85tQ_Sy>1KA}1#&
zFE0;;LKPGgU@(}XqN0+LlCrY0ii(P=s;Zirn!36=91cey5E>d9NF)-4LTPGhYH4X{
zYipy?XdN9LU0q#0Jw1JWeFFmnLqkI&BO_yDV+;mkVq#)yYHDU?W^Qh7VPRouX=!C;
zWo>P3V`F1$Ym3EVaX6fvot?eCy@P{;qobpflasTvvx|$1tE;P<o1444yN8E|r>7?n
zl()CHkB^V9udkn<A0ChQ_xC3d2mt{Bfq{WRK|#U6!66|bp`oE+VPWCn;SmuLk&%&6
zQBl#+(J?VGL?SUZHa0FU4v04)At5m_F)1l2IXO8cB_%aAH7zYIJv}`mBO^02Gb<}A
zJ3BikCnq;IH!m+QKR>^qprEj@u&Ai0xVX5aq@=X8w5+VGyu7@kqN1|0vZ|`8y1Kfi
zrlz*Gwyv(OzP_GBA~iHLG&VLiH8nLiH@CF3w6?akwY9akw|8`Obar-jb#;-+<nHe7
zo}QlG-rl~xzW)CHfq{X+!NH-Sq2b}-k&%(n(NPM8GB!3gK0ZD%F)=wgIW;vkJv}`$
zGXsz|H#avwKfkcBu(-Imw6p}EwX(9Zy1Kfywzj^$zOk`ErBXLHH@CL7wzs!;c6I=w
z_V)Jn_xBGD4h|0wkB*K2Zck25PESwI&d$!y&o3@6E-x>yuC4$$Z*FdGZ*TAJ?(XmJ
zA08eaA0MBdo}QndUtV5bUta;dX*3%45BW(D=sS=zLRAA;|1Hpe=KrK1np!0$2zU=f
z7(^QBzN{a!@`=FxBP2ga@rWMrA*zrAHA|yG;2(O4$tM}ZxKCuiDI)!j?;4hzrA6h9
zTKEjl;w3(@W0-o@C`r22P%47+3)1EHhrfKu{RLoBC^i!Hm9aU`yq^I>w{|%<y?`mX
zp@hh=f0??H1$zn6Sus8ut-B84i(Wk;Ka)hkmwUhdB8X>>__!C&z`y?){R40t2qvcr
Jsgf}w{0;c^2ATi>

literal 0
HcmV?d00001

diff --git a/eu.etaxonomy.taxeditor.store/icons/specimen_derivate-16x16-32.gif b/eu.etaxonomy.taxeditor.store/icons/specimen_derivate-16x16-32.gif
deleted file mode 100644
index 6588e07dab0ecf2155848b34e4062bbb65edc045..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 995
zcmV<9104KENk%w1VGsZi0CxZYA^!_bMO0HmK~P09E-(WD0000X`2+|G0000i00000
z5C9MWhaPt|uZgsFc6R9E=v|9x(!SJtuZT`vQL4eOkW`m^e{-abq{^|)F@Qz?|Npwr
zztG;(reCloe?6MMqja}eKa5nbuc*n}!j_qb+uGV5i#mq0lJxZSms6mJhkn}0-6?`U
zr>3T0pl{#g;JB8)$;8N^b*D>`TpWNll46&q!L5CkgT&Ryki49Pql_MdIeu<=UYBj*
z;L^+6&#uX}wzakO{q>evp5g7??(Xg#do`O|qs_C?;@;xl(BZ<%#Q693A%i+Kg-X1k
zzG$6wOq*bWj)jAAev?+4n^UHYvXxnyYQ56J&$-dz=i`Q`j+k1XEr3F@$+wunqNS;&
z;M3yG+|i<SsaRN8Sy@?HT3TCMTU=aRU0q#XUS3~cUtnNhVPRonVq#-sV`OAxWo2b%
zW@cw+XJ}|>X=!O{YHDk1Yiw+6ZEbCCZf<XHZ*XvMadB~Sa&mKXb98icb#--ic6N7n
zcX)Vsd3kwydU|_%dwhI+eSLj?etv&{e}I61fq{X7f`WsCgM@^Hg@uKNhK7fShlq%X
ziHV7dii(Sii;Rqnjg5_tj*gFykC2d%k&%&-l9H2?la!Q{m6es2mX?>7mzbECnVFfI
znwp!No1C1Sot>SYo}QndpP-<ip`oFoqN1atqokyyrKP2&rlzN-r>Ll?si~=|s;aB2
ztE{Z7t*x!DuCA}IuduMNv9YnTva++Yv$V9dwY9ajwzjvox45{txw*Nzy1Ki&yS%)-
zy}iA@zP`V|zreu2!NI}8!otJD!^FhI#l^+O#>U6T$H>UY$;rve%F4^j%goHo&CSiu
z&d$%z&(P4&(b3V;($dq@)6~?|)z#J3*4Ee8*Vx$D+1c6J+S=RO+uYpT-QC^Z-rnEe
z-{9cj;o;%p;^O1u<K*Pz<>lq(=H}<;=jiC@>FMd}>gwz3>+J08?d|RE?(XmJ@9^;O
z@$vEU^78ZZ^Yrxe_4W1k_V)Mp_xSku`T6<!`uh9(`~3X;{r&y^{{H{}{|K!B9S9ug
zzy`sC1TRqVumIsf914!WNK(b&KpX)&AVG4);y@lZkR;eaVt_{<P<BKx!Jvo74>yLS
zXo7GAK?VgJV308o$c!fhVkl9;!etH%4j^n;A|wbADM4Pm&>;i?hY~b&Xn29*1rrVu
zPyo;&_D78<D0Gn3Ve^EBv^rk6pfZ)L1|b5aXxRHA$chjR_G$pZWZ(l46^cwTa==Op
R0~4Hh%pky{Wr6_#06U+kJ;eY3

diff --git a/eu.etaxonomy.taxeditor.store/icons/specimen_derivate-16x16-32.png b/eu.etaxonomy.taxeditor.store/icons/specimen_derivate-16x16-32.png
new file mode 100644
index 0000000000000000000000000000000000000000..35b8a1a9bc4f8a9cf4aca05f1893fdb694269344
GIT binary patch
literal 1283
zcmd^<=Tq7T7{`A$y-Uts#w9P(w2i&AP10P>HnwMbn&xbcp0zbLQPaA?y|<`{0*VSE
zE>wm%P!wE<3%4jvP*D+afXHy+-g}k4%m2{l?)yC7=iPJP``nZK*3#^z_Gj7v0NgbH
z-NZ^W@BF75*EIcG-P_gxa1D5CVPmQjsn1Goh=_<#tJF>@KI5DT7z<<R^sa)-%CI5E
zAi_#gO9pENdPvi&tE<-0&apWW9aQrK@hX=?3vaSD!r8D`WqfHjfsB?)BswXEN%i>s
z{e7Y}6^({V__Am5MhrR~ObwDRD4GczelM>G!uS*K_yzJOyepBxWyTUvy<%QQdtL$!
zr-L$p2SS~R0ZPUAkaV<~&u(P14=xS}b_L1}+2-cvLzq6rfhMRIs^(PkF=h8q@A1*m
zBb1?j;velr9PfOH1qB?RmWT?4XZ=l~SkrNJId-|e9pl}jEkfn;d{S8&$-Yn*X<Wx|
zB5{jL%S#m^m0(s_3@Nv@wY9Uev$wZ*aBy&RbaZlZa&~qGfk0p|*u}-g)z#I_&CT82
z-NVDf)6>(-%gfu_+sDVp*Vot2&(GiAKOi6=FfcGEC@45MI3y$_G&D3UEG#@c90Gx8
zvW<+4jEahaLZQ*o(J&Y+CMG5}HWm(tBM=BA5*Zg47at#wLZK285)u;=lai9qXfy_c
zNls42VzDVHDL5Q1H8nLYEiFAgJtHF{Gcyy9$7f|_WoKvS<m3<t1R{}0B9X{sa&B%e
zg+j^8%gfKtFDNJ|EG(o_sYOLa#l^)m8m*+Hq_nh@PNy>%jIy$_^78VEii*n0%Brd=
zCX-oRUCm;#YHDg~YisN3>gwz38yXteY<6Q~V^dR8b8~Y`OG|5OYg=1edwY9FM+b+)
z>Fn(6>gwWhx!v8}Jv}|Wy}f;Xef|CY0|Ns*9*@uG4-O6v4Gj$s4+{i>k&%(n(b2K7
zF`-a6K0YoIi6$l{#A5N}<mA-U)b#Z9%*>2LB9Tg^v$L}@nQU%uPA-=#6bhwMsZy!t
z=jRs|78Vy5mzI{6mzULQ^~%c1>gwv++S>a1`o_kF29K?+t?ljYot>TC-QB&tJq?Ek
z2M33Thet<8$H&JfCnu+;r)Otp=jZ1a7Z;b8ml~wW3i~_&&;r7(EUh)`2L*iK{}&eE
zwV-=6@1f4z<Tslr$@{;=cR$j*^L(?9*?eF3yI1SCUMhmmu8fMh^s;~Xrj5*Zzu$Gc
zwZeFNiTZuud@2X>9wd)?eJ^YA`j-z5-BU8e7r32w!OI)8!c4UQ`%)hdt(5_<-_S*q
zTI$a!RvsT;*HUBsABWr;`Rb9)4`yKj*c(r@G0`umpIR6`wRlE<0DOXZQxfsm-|ViR
z!Pf~GTT27dlbnB;KW=~=33QlPEkkS}UsPS35qj=Dg+4qH{`~w`&Gmq}sijG^F*yET
Dt?N}f

literal 0
HcmV?d00001

diff --git a/eu.etaxonomy.taxeditor.store/icons/specimen_scan_derivate-16x16-32.gif b/eu.etaxonomy.taxeditor.store/icons/specimen_scan_derivate-16x16-32.gif
deleted file mode 100644
index 031621fb93236fe9014fb8383c5d92ef0de05180..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1036
zcmV+n1oQhxNk%w1VGsZi0CxZYA^!_bMO0HmK~P09E-(WD0000X`2+|G0000i00000
z5C9MWhXP_6ro*meWn%2^>@_tqZl8M9)zmtFOKqcj5_Kzdg?GWczgAXLoV}%ri-#kA
zI{ftd-QC@6c5Z*Iijk3y8+9^9j#$gf%Cxhy2yY>Rgnr@T;r{;qnw6J|w3S3eLZ+pp
z5r8cmf;P$A&Pk10^z`(CpNVN{W-Wz7!Op}Sdo%-V9S?dc<m%;ne0SLB+|bX@b98T!
ztCz#X!_(i_ZEb0kl#x-2UwN5-3v(tEdoH-RxIl+d`1SVyavODZa@gS77J@Q_g@H|z
zUhnYljE#v`Tvrx*FgZCkLXuV}d_8}Fd#lE=g{+O4nV36+O{1u!eSUdaT2{ipz$1V=
zRaI41R#sP6S6EnBSy@?HT3TCMTU=aRU0q#XUS3~cUtnNhVPRonVq#-sV`OAxWo2b%
zW@cw+XJ}|>X=!O{YHDk1Yiw+6ZEbCCZf<XHZ*XvMadB~Sa&mKXb98icb#--ic6N7n
zcX)Vsd3kwydU|_%dwhI+eSLj?etv&{e}I61fq{X7f`WsCgM@^Hg@uKNhK7fShlq%X
ziHV7dii(Sii;Rqnjg5_tj*gFykC2d%k&%&-l9H2?la!Q{m6es2mX?>7mzbECnVFfI
znwp!No1C1Sot>SYo}QndpP-<ip`oFoqN1atqokyyrKP2&rlzN-r>Ll?si~=|s;aB2
ztE{Z7t*x!DuCA}IuduMNv9YnTva++Yv$V9dwY9ajwzjvox45{txw*Nzy1Ki&yS%)-
zy}iA@zP`V|zreu2!NI}8!otJD!^FhI#l^+O#>U6T$H>UY$;rve%F4^j%goHo&CSiu
z&d$%z&(P4&(b3V;($dq@)6~?|)z#J3*4Ee8*Vx$D+1c6J+S=RO+uYpT-QC^Z-rnEe
z-{9cj;o;%p;^O1u<K*Pz<>lq(=H}<;=jiC@>FMd}>gwz3>+J08?d|RE?(XmJ@9^;O
z@$vEU^78ZZ^Yrxe_4W1k_V)Mp_xSku`T6<!`uh9(`~3X;{r&y^{{H{}{|MFqIS3pW
z;er7J0}~1~Fk{9C0!WZxxNt!s2O&SAXgDE2!x9%KHYlXvphyi2GfoJh5JhA{3MO|5
z{BgoY%aKK5IGJJNL=BrR2RhK;Kneo^QZy9#5mX?EA`~e65KzQMhYk=pq`<)h2$6v$
zFbJf<WCD*HO#oC-@}xkE9#dM7NRT5(h5#F=98sZT#eoP5hOAIQSOg6YNkR}-kwXTQ
z#Ug^B7{I}Uk02r{WH5o@L5?FVR(KeQKt%!_Llj8xkOYN=1_}p^c)?+Y5sSDvlz@Rd
GAOJhX|0{?9

diff --git a/eu.etaxonomy.taxeditor.store/icons/specimen_scan_derivate-16x16-32.png b/eu.etaxonomy.taxeditor.store/icons/specimen_scan_derivate-16x16-32.png
new file mode 100644
index 0000000000000000000000000000000000000000..557e2e68e5bf10fb84294e8c801bef2c81d1189b
GIT binary patch
literal 1314
zcmds%XHVM)5XS$8DxyS`PytmEDm4mi(xjl&6eL1YC6uI)5K15zFneRnG?-xnHU=|{
z4VY=O!I)*X*&A%YOtUwbJ<Q%_*Zlzb0zK)u)9HD2kAAucU7f!r#2<(Q03e~Isi7yF
z_x_WZsIWg(kkkhNQ9xJw%R3S42f3^gTRZFR-EC!MuxkctY;5!;=A#P@{XO!z7v86>
zu>}IrPi>+TBEudBzPviVn46n(_IAY-6UgMKhe+`ID5Kuqo=PTD%<T~_Bye$Q@#f|x
zIU$KqnV_Meo=eY>!Yat&RJvyev`En7<6~S#1Po@cfd8v)fGvmqL)7_4Nz}6y{wmtv
zXL4h9kjwS-aw9X6SZvk^Z^Fd|79UUkOtA2yV(xnWB8^t8t*w0%_E~Up1|S|Hk%-BK
zX;~aN1RwM%&U|lwk4TCzG&Ph(zfe_GQICZ@^?!}Qq8Xj#_#zUON>K~`M9a?!2=p_C
zLfTteA7j-F3=AL;h@qjOk&%(Hu`v`1H8C+UH8nLeGcz|gx3I9Vw6wIcva+_ewz09X
zwY9agv$MCicW`iUbaaHlU`|d>a5&uA+1bU##nsi-&CSi--QB~(1A#zzdU|?!c_EQV
zZ*OlOA0J;|Uq3%T6bgk#qy7E;0|Ej90|PM_3>J$G3JSvEaKXXBAt51nJU%ouG%PGE
zJUl!iB7#65L`Fsui9`~K6crT}9UUDL6GJAGV`F3E;^N}t;}a4R5)%`Xl9DJC3YAJt
zPEJlqNl8sjO-oBlPfyRt$jHph%*x8j&d#RMXgN7KbUHmZH#aXYFF!xOprD|zu#mxE
z6crT}7Z;b5l$4g1mX(#2mzP&mR4|#$%F4>Bs;cVh>YADwVeEBvb@lc24Gj&Ajg3uB
zP0h{CEiEmrt*vcsZSC#tEEbE+W_NUSbar-jb#-w#obK-Ko}QlG-rl~xzW)CHfq?-o
zmpeE(I5adgJUl!yGBP?kIyN>oK0ZD%F)=wgIW;vkJv}`$Gc!9oD`aebexAqUEi5c7
zE-o%DEiErEudJ-BuCA`Ft*x)GZ)|LAZf^4V{H?96?d|QIot@p?-MziN{r&xegM-7v
z!=s}kA#5inC#R>UXJ=;uf#Cf7{Nm!`^78WP>gxLXT1e^b?JZA9(F6cMfR~<*zHt3&
z0bh0gF9vY?n<D+S@I4G^X}ta7J8csK5`F8Tq9PUv3ZEj9R*hf1l4o~hiRhdL>G8Go
z=286NdmyPl4fVgZK|UeBp<o#WRYYP_{eAV;LGGmXoU~%=la3$QENS^wCrKGycNwX2
z2ZVB5f=tYiZP~tuJ4n3n1BXKqh|N%x1mJMgIg>wqXRFX13jF{EYlhXrjbY5Y2sJny
z2K$xzg5&#4<bL9N&`%|_J4(UC)HGUbeopc?E%b({YB`SVcM3Ys9TXp_{v+|bd3aS{
l&jq;C6)eWXVGBX=AfPe(XHAB@XSeV;K<k~3Mv1y5?q3hsL%{$5

literal 0
HcmV?d00001

diff --git a/eu.etaxonomy.taxeditor.store/icons/tissue_sample-16x16-32.gif b/eu.etaxonomy.taxeditor.store/icons/tissue_sample-16x16-32.gif
deleted file mode 100644
index e9a3d6ac402a7ff926f90715f0e6ed0588b59949..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1002
zcmV<G0~P#7Nk%w1VGsZi0CxZYA^!_bMO0HmK~P09E-(WD0000X`2+|G0000i00000
z5C9MWhX7#`l(n2ggjCq$+a7c@W}9^R_4l>Hxhr-*6oN4oZ!PKT>d4f~f2fI3mSYHK
zAs2ixJZ(yv$fs_pe*XUc@A>j3emon4HUx7aGk!*SjeQe(El_@3vC+EJ-PT-|YlOIx
z<K*KTi8mo@H3elJbf17Ifj=C3H4tScoV24fic0eC@eFq;409$OggEQ=?xWGK3v4Bd
zs*>L2;Jehqd8vi<^7YTx(Y?sPQi)&@f-g3LN)mJ{0BaVZw5Bh3LI7<Y(&g7La6sMc
z;YWv9Ietqba5i9>Z`$bI`}g|g=;msicSML*&D+r%i8xPBPf$=$QBhG+Qc_b>Q&dz`
zRaI41R#sP6S6EnBSy@?HT3TCMTU=aRU0q#XUS3~cUtnNhVPRonVq#-sV`OAxWo2b%
zW@cw+XJ}|>X=!O{YHDk1Yiw+6ZEbCCZf<XHZ*XvMadB~Sa&mKXb98icb#--ic6N7n
zcX)Vsd3kwydU|_%dwhI+eSLj?etv&{e}I61fq{X7f`WsCgM@^Hg@uKNhK7fShlq%X
ziHV7dii(Sii;Rqnjg5_tj*gFykC2d%k&%&-l9H2?la!Q{m6es2mX?>7mzbECnVFfI
znwp!No1C1Sot>SYo}QndpP-<ip`oFoqN1atqokyyrKP2&rlzN-r>Ll?si~=|s;aB2
ztE{Z7t*x!DuCA}IuduMNv9YnTva++Yv$V9dwY9ajwzjvox45{txw*Nzy1Ki&yS%)-
zy}iA@zP`V|zreu2!NI}8!otJD!^FhI#l^+O#>U6T$H>UY$;rve%F4^j%goHo&CSiu
z&d$%z&(P4&(b3V;($dq@)6~?|)z#J3*4Ee8*Vx$D+1c6J+S=RO+uYpT-QC^Z-rnEe
z-{9cj;o;%p;^O1u<K*Pz<>lq(=H}<;=jiC@>FMd}>gwz3>+J08?d|RE?(XmJ@9^;O
z@$vEU^78ZZ^Yrxe_4W1k_V)Mp_xSku`T6<!`uh9(`~3X;{r&y^{{H{}{|K}IDF_@$
zaG-_-1rt(Oab$!-f(CpDA+h7(!W2bfY*4^NVUhqpV(1`1U;~kaGXy+HKtKe66A6kG
zw1EIf%M&kMB(ShTpob+$I;e<o;lhZb7YKw9*Z_b92`@k>IDz!S2_*s@@Q7i70t^&X
zsV2xUP-_bs6^xv4Qq%<o83Swda6n-~3>SDWV8~%$;EfhTg2bQ-fkle~HVQJJz=6jG
Y2qr$@cvvFEf+hnJKRgh@;=q6aJ1&4682|tP

diff --git a/eu.etaxonomy.taxeditor.store/icons/tissue_sample-16x16-32.png b/eu.etaxonomy.taxeditor.store/icons/tissue_sample-16x16-32.png
new file mode 100644
index 0000000000000000000000000000000000000000..fa4e5f647cdc081c1693d648d7e5bb2665e322d3
GIT binary patch
literal 1287
zcmds1_fy&j9R22E(lkx3CN@nQO)kl`o^8%rFNul0+-Zz9(IyVWy>JgyRB$UQB8q!Y
z+zZ?T+za<s6h%>RAh=Oc1ShpW=RfG@?!9;K{r2wOeX!b^AMf6NbQ=JGyXv1*L02mN
zA8uX0Vj0=*bphZyp#2%F23X!tCgDDy!E>yICx};eS%?$9fYjam!b|A~l>7sj?B@2?
zAax`NkJU-FzGeUHVSxNQ7mdupQda`<^73-;geQ%BCmE_B27mSv`L}OOpoE{SHqx|~
z(n4j-nx;b0O^K{EmL&GgGwACZwoeeb!7?FAQvR>SZKZL<!dH<RJnq3AZ<#xA>Bs1|
z+sE8OO7(ZnzebiNGTF<m)NWrw7@x<Vpi$ZfyFggTJ(QdRO5;A_1pxgqpI9R2qXM`*
zo?_GF+>{wRD<8uR6_NiucT<35z~~#yGr=i)gX4trR*ldfTcAi{-)d=TX=`ii=;(kz
zAYENuFc_?-r>C#4Z(v|xXlQ6;WMph?Y+_<!YHDg`W@c_~Zed{ofj}%REv>AqtgWqW
zY;0_8ZSCyr?CtFx92^`S9i5z<piro@v$Knfi>s?E3<h&^b8~lh_wew5!{G=7!qd~!
z%gf8#+uO&-$Jf`_&(F`_-#;KAATTfxi9`kk1qBBOhlGTnP^i$*P&67H78ZuVV8X-0
zBO)TOSZriuWK>jCbaZq~OiXNSY+PJie0+RDLPBC<Vp394a&mG?N=j;KYFb)adU|?B
zMn-04W>!`f4u{Lm&d$ln$<58p%gf8p&o3w_C@d^2Dk>^2E-oo4DJ?C<<M9Lnp{%T|
zyu7@kqN1|0vZ|`8y1Kfirlz*Gwyv(OzP_GFB$7y^hK7d5#>S?mrsn46mX?;**4DPR
zw)Xb+j*gDb&d#o`E;5<i-QC^O)6?7A+t=6E-`_tlFfcecI5adgJUl!yGBP?kIyN>o
zK0ZD%F)=wgNuf}trlzK+r>Rux%*@Q}>@1B&o12@PpP#4G=?e=Bi;Ig427}3DE-fuB
zFE6jGtgNoCvRJIOwKX=I&Eas?*Vi{THa0gmx3;#nx3_n8c6N7nxm@nv-roNH{=vZk
zkH<SaJUlu&;`8~($HxMJKqwTRoSdAVo}QhZou8jyTwGkOS0obg(}kk|a1B6!G<C1+
zR|kBR{9gk=gaD+9uiit0y6Std5B<v|?Gag7{KhgQ1y3G+>L;n1s#hQ|UlO@HqqI2O
z^EYt2U$$`05gM`h+;Zx*j+rV2Q7H2-4_Tp*JVWBVR3Y{}yva@f{JR*N_04D(1|0u1
zNzY7q1v%8HsQdu<WTdPLl3;+u)o!+Z8}UbzhW{5aF~tuqe_{v{9e`mAjO_4pvHJK=
zp+{7E^4uIu5j7>>CQYJY99{E&i&^dEI`Hw0Dq3+T?eBw?xaVDxL-(Y>1$3s)RRcg>
LO;fc>1%mn)(6c<~

literal 0
HcmV?d00001

diff --git a/eu.etaxonomy.taxeditor.store/plugin.xml b/eu.etaxonomy.taxeditor.store/plugin.xml
index f70e96d34..28f8b2242 100644
--- a/eu.etaxonomy.taxeditor.store/plugin.xml
+++ b/eu.etaxonomy.taxeditor.store/plugin.xml
@@ -229,6 +229,7 @@
   </view>
   <view
         class="eu.etaxonomy.taxeditor.ui.campanula.derivatesearch.DerivateSearchView"
+        icon="icons/derivate_search_view-16x16-32.png"
         id="eu.etaxonomy.taxeditor.ui.campanula.derivatesearch.DerivateSearchView"
         name="Derivate Search"
         restorable="true">
diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/model/ImageResources.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/model/ImageResources.java
index 690be9b31..a5d2a388d 100644
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/model/ImageResources.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/model/ImageResources.java
@@ -319,19 +319,19 @@ public class ImageResources {
 		registerImage(registry, LOCK_OPEN_ICON,
 		        "lock_open.png");
 		registerImage(registry, DNA_SAMPLE_DERIVATE,
-		        "dna_derivate-16x16-32.gif");
+		        "dna_derivate-16x16-32.png");
 		registerImage(registry, FIELD_UNIT,
-		        "fieldunit-16x16-32.gif");
+		        "fieldunit-16x16-32.png");
 		registerImage(registry, SPECIMEN_DERIVATE,
-		        "specimen_derivate-16x16-32.gif");
+		        "specimen_derivate-16x16-32.png");
 		registerImage(registry, ARTWORK_DERIVATE,
 		        "artwork_derivate-16x16-32.png");
 		registerImage(registry, SPECIMEN_SCAN_DERIVATE,
-		        "specimen_scan_derivate-16x16-32.gif");
+		        "specimen_scan_derivate-16x16-32.png");
 		registerImage(registry, LIVING_PLANT_PHOTO_DERIVATE,
-		        "specimen_scan_derivate-16x16-32.gif");
+		        "specimen_scan_derivate-16x16-32.png");
 		registerImage(registry, TISSUE_SAMPLE_DERIVATE,
-		        "tissue_sample-16x16-32.gif");
+		        "tissue_sample-16x16-32.png");
 	}
 
 	private void registerImage(ImageRegistry registry, String key,
-- 
2.34.1