From fa58495986757601c68acd395e0e165d037b603c Mon Sep 17 00:00:00 2001
From: cajus <cajus@594d385d-05f5-0310-b6e9-bd551577e9d8>
Date: Wed, 16 Apr 2008 06:21:19 +0000
Subject: [PATCH] Moved images around

git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@10483 594d385d-05f5-0310-b6e9-bd551577e9d8
---
 gosa-core/contrib/gosa.conf                     |   3 +--
 gosa-core/html/images/button_cancel.png         | Bin 883 -> 0 bytes
 .../html/images/{list_new.png => lists/new.png} | Bin
 .../{status_stopped.png => lists/off.png}       | Bin
 .../html/images/{lamp.png => lists/on.png}      | Bin
 .../{list_submit.png => lists/submit.png}       | Bin
 .../images/{personal.png => login-head.png}     | Bin
 gosa-core/html/images/logout.png                | Bin 0 -> 1330 bytes
 gosa-core/html/images/prio_decrease.png         | Bin 842 -> 406 bytes
 gosa-core/html/images/prio_increase.png         | Bin 832 -> 412 bytes
 .../html/images/{stop.png => small-error.png}   | Bin
 gosa-core/html/images/status_running.png        | Bin 829 -> 0 bytes
 gosa-core/html/index.php                        |   4 ++--
 gosa-core/html/main.php                         |   2 +-
 .../acl/images/new-role.png}                    | Bin
 .../plugins/departments/images/department.png   | Bin 0 -> 713 bytes
 gosa-core/html/plugins/generic/images/head.png  | Bin 0 -> 753 bytes
 .../html/plugins/generic/images/plugin.png      | Bin 0 -> 4119 bytes
 gosa-core/html/themes/default/style.css         |   2 +-
 gosa-core/ihtml/themes/default/remove.tpl       |   2 +-
 .../plugins/admin/acl/class_divListACL.inc      |   6 +++---
 gosa-core/plugins/admin/acl/remove.tpl          |   2 +-
 .../departments/class_divListDepartment.inc     |   4 ++--
 .../admin/departments/dep_move_confirm.tpl      |   2 +-
 gosa-core/plugins/admin/departments/generic.tpl |   2 +-
 gosa-core/plugins/admin/departments/remove.tpl  |   2 +-
 .../plugins/admin/groups/class_divListGroup.inc |   4 ++--
 .../plugins/admin/groups/class_groupGeneric.inc |   2 +-
 gosa-core/plugins/admin/groups/remove.tpl       |   2 +-
 .../admin/ogroups/class_divListOGroup.inc       |   4 ++--
 .../plugins/admin/ogroups/class_ogroup.inc      |   2 +-
 gosa-core/plugins/admin/ogroups/remove.tpl      |   2 +-
 .../plugins/admin/users/class_divListUsers.inc  |   8 ++++----
 gosa-core/plugins/admin/users/remove.tpl        |   2 +-
 .../plugins/personal/generic/class_user.inc     |   2 +-
 gosa-core/plugins/personal/generic/generic.tpl  |   2 +-
 .../personal/generic/generic_picture.tpl        |   2 +-
 gosa-core/plugins/personal/generic/main.inc     |   4 ++--
 .../personal/posix/class_posixAccount.inc       |   2 +-
 gosa-core/plugins/personal/posix/main.inc       |   2 +-
 40 files changed, 35 insertions(+), 36 deletions(-)
 delete mode 100644 gosa-core/html/images/button_cancel.png
 rename gosa-core/html/images/{list_new.png => lists/new.png} (100%)
 rename gosa-core/html/images/{status_stopped.png => lists/off.png} (100%)
 rename gosa-core/html/images/{lamp.png => lists/on.png} (100%)
 rename gosa-core/html/images/{list_submit.png => lists/submit.png} (100%)
 rename gosa-core/html/images/{personal.png => login-head.png} (100%)
 create mode 100644 gosa-core/html/images/logout.png
 rename gosa-core/html/images/{stop.png => small-error.png} (100%)
 delete mode 100644 gosa-core/html/images/status_running.png
 rename gosa-core/html/{images/list_new_acl_role.png => plugins/acl/images/new-role.png} (100%)
 create mode 100644 gosa-core/html/plugins/departments/images/department.png
 create mode 100644 gosa-core/html/plugins/generic/images/head.png
 create mode 100644 gosa-core/html/plugins/generic/images/plugin.png

diff --git a/gosa-core/contrib/gosa.conf b/gosa-core/contrib/gosa.conf
index c87bca3a1..5471185f1 100644
--- a/gosa-core/contrib/gosa.conf
+++ b/gosa-core/contrib/gosa.conf
@@ -3,8 +3,7 @@
 	<config_version>{$get_gosa_version}</config_version>
 	<menu>
 		<section name="My account">
-			<plugin acl="users/generic" class="user" icon="personal.png"
-				path="plugins/personal/generic" />
+			<plugin acl="users/generic" class="user" path="plugins/personal/generic" />
 			<plugin acl="users/posixAccount" class="posixAccount" icon="posix.png"
 				path="plugins/personal/posix" />
 			<plugin acl="users/environment" class="environment" icon="env.png"
diff --git a/gosa-core/html/images/button_cancel.png b/gosa-core/html/images/button_cancel.png
deleted file mode 100644
index 96919575afdbc31e7f3539f8ad1cb709f813a7ee..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 883
zcmV-(1C0EMP)<h;3K|Lk000e1NJLTq000&M000&U1^@s6#I$TX00004XF*Lt006JZ
zHwB960000PbVXQnQ*UN;cVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBU#1xZ9fRCwBA
z{Qv(y11$hR05PB&{L+O%;H5Kz0<rop$ulTilw%M;HxnR$n9vOcitYdVhvEDa8wLX+
z3^f3%KhN-&VgGpvRKo!RhzZ?LzNi2L{%Bu;e}5SEKQP5@IMmSnvX1fsGWN0t|A6c>
zA_&6)0*DFSP!7Ey22LGc2Ehndfqy`k+}6i59NAC-8CeEF32_E_Q&9tu%TMt`3<n4x
zh>QO-fLy5X|L<Q0hTlIJ7=C?c;MQ_s5DB#v_zzTkLla>*x}gl;e}M7--+vkY{R77h
z*kFJFVgv;=BO@aNC`>`#2e}kvD9CVzUq2W=o!`swY~|?>Knom!Vb6fg(6{%VG2B1#
z?gP+)j%J@2E`ZDg2q3t@AOH$ekoQ3@<x#f=8_e+Y8^gzo#~Gfizx)9x$3VzXSgHUB
zAQXc^02HPm?~4VR3h=2I0uBGk!0_Wc!{?h<fR_Ab;1v_cYbeZMfB?cU7z99J3Uaxm
zkFEf}q9)j2hMyqAz7sSQW-veiVKo>8t||i!|HrUj&Ra`>S3(-a&<~GZGTb@x8mpl&
zg8>4F1y?$SMikil$c8d}2L;V<u-yNDxHAtx05K6t{K#PnHuT#M1_2H>21P{<a8f+R
zjy)3r1P~LU#E<O#5076nFnk3X{`D7w2pcnlvIsLM&F(+OifK4N0HK62E<<4v1@b<~
zr65BYz5s*h;~$3C@BcB}`Ni-7sNK=}FCw`C1Q6U{LWY7O3K*FTAn$`*D)JX-%Lkyq
zHwK2+pk&GbG2Dg$l0g6h2yF0W1x5u>DMd`;hlc5XWhMpz(eDVaBN=XJ{r~?1fB<5G
zI2|bPm*K(x-~R}vQ>&jq_CE$kkoR9>#@Pb~h~W$X0R%7TLFMULafb76d_@1hb{F~&
zET!I`;=^5R9%W`QIKsg2{w2^|APi)mKLRa)KxP625K82M%Tr(&f=ekJi60pN4FU%X
z)TN;C{Qxr<Ab>EcCQx|_#6(w3K*JSaE=A6H00G2EtI8B0zyJ_{_}Csa6@>r*002ov
JPDHLkV1jeQWgY+k

diff --git a/gosa-core/html/images/list_new.png b/gosa-core/html/images/lists/new.png
similarity index 100%
rename from gosa-core/html/images/list_new.png
rename to gosa-core/html/images/lists/new.png
diff --git a/gosa-core/html/images/status_stopped.png b/gosa-core/html/images/lists/off.png
similarity index 100%
rename from gosa-core/html/images/status_stopped.png
rename to gosa-core/html/images/lists/off.png
diff --git a/gosa-core/html/images/lamp.png b/gosa-core/html/images/lists/on.png
similarity index 100%
rename from gosa-core/html/images/lamp.png
rename to gosa-core/html/images/lists/on.png
diff --git a/gosa-core/html/images/list_submit.png b/gosa-core/html/images/lists/submit.png
similarity index 100%
rename from gosa-core/html/images/list_submit.png
rename to gosa-core/html/images/lists/submit.png
diff --git a/gosa-core/html/images/personal.png b/gosa-core/html/images/login-head.png
similarity index 100%
rename from gosa-core/html/images/personal.png
rename to gosa-core/html/images/login-head.png
diff --git a/gosa-core/html/images/logout.png b/gosa-core/html/images/logout.png
new file mode 100644
index 0000000000000000000000000000000000000000..73b27d9fd698719f5b3788953815b886eac142a9
GIT binary patch
literal 1330
zcmV-21<m@2P)<h;3K|Lk000e1NJLTq000&M000&U1^@s6#I$TX00006VoOIv0RI60
z0RN!9r;`8x010qNS#tmY3kv`M3kv~l1cbK$000McNliru(+Ua}8!d@3bjbh!1iwi{
zK~#9!g_YlLR7DiWKQs5<z5BB*+ZL$87DP}fzd{A%LHq#-1u-JVL?a;~DbKw4;}0Mq
z@s$uBHX8NC2T6<%2;oP9G=L~9)&deDR11W5x7{E2Zg=-~@15~sp-?P%l5ZxH%zWmY
zIdkR+o?`voYb>pGyMhjlj%olzRl#t{GP4^moSS&kUhx#@THph%^$H+mK@7k{R}|dV
z(C-U*_^Xx6&Zg7p;D5pW-D?&I*lWQ@(RjQiF>9ub%$|+AXdyu)Lj2|+>Yu;K<wjLC
zpRZPxI$O5PecvtXI-gFb{b|Ad-D^4p97;e>bj5NKTYAt-yRh2Z5r)xNq&0q_Nd49=
zYR8UK=<CDrCjKng_GjNOdGY82xbc{$2b<#YO)c+i6Oo-CV=P*TVcX#Q=!tqm^*X{Z
zFx%R&mMp=VH48mB*d`q3<@sazOr&S?olGX9%?Dtu^(P4-dYU(^$J*M1(VC=s<thMn
z=iK|jX>=olObp!yAhNofq+b{6>u(qNmC7EVzqhxyYyezZxq7WF#Qvsb%feRAW<s4Q
zs#mVk^u}vM7A>Uob05;SQJ#nPJZgX4B)M%Xc4vx8{{ZGQ9hl=4>O({GQn}IoYqQ!1
zjf*Q+S-{>zQ(|3g{hNa146K<mi7tK#8496;fLPaJ++Ti0XiYsgO52X@jRZ+ac)@dw
zoj8eZYef$ZhWzpIddZM|5@-ijG&eO#e?|*|<Kmt>KM56vfvVML+p!(rb!pqN9j(-q
zmz3-~OY4!N%yi4rRH|#P<EA9gAt5DNTTzt?exZP$&oi9<5@8qwl?pN(2AJaM19Lyz
zN%-b1>}-xW0t3+zLZl=RwGpv;EQTtTP>zH4Janzby#og^qR}T-=ET-_iRMP{KU{$T
zY=|I4V)AIK<RFJfkl7rv<X{ww*thTC?A|jyb=`VGu8T1-0YXf|0hAEZ1X1<SmB>hz
zaHaaNB();smNAYWnI3%R6s%kSa4scUDQZyjh47?;VFkC9QzHC`>}st64T2~CQfE#z
zM$-h-q*kvJptIvr49k*bW;OKZL21)MTMfyder#+qj49y*;CWNvK{!lc+vEkRW|}vK
zTAJ_4jTg>M_(C2o1%9bunT)r$lU@4?x>A|qoU>~;&iqcCUAw`y|KohYGARW9_((W>
zBG=rMHvr_@Tkb5sJ3POR?lwE;B7C3n<=;uHdli6@Pd~?x$MEAZ>aiH*6DNtkwE=*8
z`}R`_hZq|gqUd?YeptHr8z4LRyPaOOc5zGv2V!&PydGb=RGN_pJXQ$PneTa&2L@E>
z?%hj&B$HoU?3{BN$WLCNwY6ugbF6UDEEc<b$C+ov<Cw`A$WRCovL4E62+O3N8>KWb
zfIB>LG1K0*Ka+a)H()fKP6w0VOeUkFJ)83L#`2eqk`t}xvh#em9P-0qVa8%e(*!9A
z(2S3bQMqzex!13k-D2_BmDc2;`_ODUovu&YL3(?8B@lam;M$vU-+#|ks!JF~hmlA`
z00P&osUXPKO!LM_IDF#d3(ubeMu6fIJIEt&0fgpfb1icnHx)vp5F(+3kiHP!xD>-f
oEzS3G%}sg01*++EdP+k61=#!}%n4l`KL7v#07*qoM6N<$g8deGIRF3v

literal 0
HcmV?d00001

diff --git a/gosa-core/html/images/prio_decrease.png b/gosa-core/html/images/prio_decrease.png
index 3773874153d7501c0b59ed9b19ff05117311d230..697fc98bcd9756ca965a143db1b76a17059813bd 100644
GIT binary patch
delta 373
zcmV-*0gC?029^VmDu2EJz5u?ptw5Uq000SaNLh0L01FcU01FcV0GgZ_00007bV*G`
z2h{@|4GtZisQ{_~0013yMObu0Z*6U5Zgc=ca%Ew3Wn>_CX>@2HRA^-&M@dak?_?!z
z0002`Nkl<ZILozDIda4>41+THRJPIsR5?ZV0e*lV;PiGQ|9?vRCV&M~$VZ&DlWeh^
z(TrwDfFLLV&y1WWAIH&ut9dy~Ow;6&APIfnpOU<uCCCak2`0nC1ZITHAQ6%tAAvHM
z1eyLvFy-vSuo-3~L_(}%EYZ9-o>KB1LC)D}f{CkPl)%|UTJ@l58rSSijL`ug0KhN~
zzI4(z;L)MBx^7ZR2#b`@zIU2c*@s|4G{^|aP)Z4_f+f1H^PgRI-AR~j;5z~UXxnyu
zK;p8>`7T4bl^rG=t>$|DaLKBY8AuaurQFqrv;C%&yb|aX{Aa`%{q1t`r~cS4ZBP^o
Tg2taE00000NkvXXu0mjfxqhDF

delta 813
zcmV+|1JeAK1Ih-FDu4d~{{a7>y{D4^000SaNLh0L01FKO01FKP?FYat00007bV*G`
z2iFQ22R0#ObP+8800P%ZL_t(I%WaceXp?ss#()3+cS!p6OVT7YX-iFNt!r_@+HCDk
zt`&64%|rxYu<b&+WmxcjFmHt2s#k)_2eMtLH(qTpHgH3n8-Mdaw2rwJtcU9C$uw;m
zza`Cg*hOb*t<Tl_@_*jv|M0xLf)|j><@ATnt8FD^^E*PST>@VU&wdnh$8IFl2akb*
zWm(J5_~QBD!QnHlww6BZDUpw5pvjb45COPO6|Yi!syTDtC!IfzCzX4DT9#D;P@WCH
z`^67CY;DuU?tjj<_x8Tspx>TvN6`!v-5_X$iA3XiqY>CPT}gZ(T>IA0>#3Q1K3`P;
z-pu`!s;bEg*@0y9@cR*TRpI8O<jAKgU+sbXeR#6ulZtz!H>lz9LVQTnioXuN(K#al
z93^^aOGl#lvuqS81VX}xTj%NPSaH{z2G3uqV-cO+Eq~GW8TGA$KwJ*wel~o?_-J^i
ziKfVU9^poHO}LJ``qq;&2^i7cvrf8AI!dTt2AU$7E(3tOQx#qY$6L)?2th}S-Z-!H
z^huDLyAu@xn&9eKnSFzC`d=~E3G}An)JT;5yJ7$|g#!4}Xjeh_c5SWQSV&`6CQ|SF
z(l9)<-hY*k@FYUsd05ma*)9V;Cg(2|0BDKos{;RrIsQ+LZ!XLOu&`9c_nbQt<TY=(
zw0QY%7l6*zU|r;S+?w<`_FZ}9XW!@k%yK#GPW&$OCtj=I)=qx=%OXqvIsk+k<r<OE
z2R>h(^XmQBWEtCjdUm7w*JA;Y85uPZ@_J@#Yk&9t9UA3|%iMxPP?Lm1L5}_yL`q17
zOXyySE4QEAZK#ZIzjXSOsrqg*Bcm+{aWR=_?#}k<L>pY@N)D3+g|R|2Qh=;ZGdnvy
z5vWaNf3tQ^tUIR6$W0Uc!$|FOJ!nQ^rexVwShRiI>cXOM?bE7T{Q8QOExz;`>p};v
r2PT1jplgNWO{nhDwX4=n`$g`5hkydB$NJ?m00000NkvXXu0mjfpW~La

diff --git a/gosa-core/html/images/prio_increase.png b/gosa-core/html/images/prio_increase.png
index d9d2de433a82c4c66100e4dfcd68525939feccf7..9d9856c81de38b295b9a09664d1b4259930f012a 100644
GIT binary patch
delta 379
zcmV->0fhd*2Al(sDu2EJz5u?ptw5Uq000SaNLh0L01FcU01FcV0GgZ_00007bV*G`
z2h{@|4H_KB0Ox4{0013yMObu0Z*6U5Zgc=ca%Ew3Wn>_CX>@2HRA^-&M@dak?_?!z
z00031Nkl<ZILoz@v2DXJ5Jf+O4COS|02&}};wBzIol`giNPh)yjd%dfpqc)^;#`Qa
z>_9T2!Uqrph~vBe??~X8VcDW>+jx}ovUu4n=mJH2pH8s~kh6s-I0aFl98J^2zW`=A
zTw`U5kOYYkg~R6|9s+W<pd6IS#rs7GyWM-t0?aJj1(9RLzW^s(0x8sW9d`h;94dZi
zE0bWcrLtF56?9jC=+KSluItjRY{_x{IVTkbE{CK^!SU;uetmacmjFzCD3$=A@B8HC
zd>DoV0BLEy`;UE4f@_rD_x)_{>k@z><hqV=DHZ`!6A8-KKjo>3Q^Qurc3Z{fZ4*!Z
Zu@`#i79?gp1C;;(002ovPDHLkV1kZ*obUhu

delta 803
zcmV+;1Kj+a1HcB5Du4d~{{a7>y{D4^000SaNLh0L01FKO01FKP?FYat00007bV*G`
z2iFQ22R0L|qd=_y00PZPL_t(I%WacQY*bYkhM#lpouA%LXJ|*Jol;t0nsk6fXrX8j
zt5M@Z2^%Ic5)uf>O<+Mn+=>Ys7rHh<EgD$3aE+T9NJvm)Xn&l6L~(#3<$wA&(=vB1
zow@g(!=gB)(6c&U@;>j$_kQ0Ita5hQ7cJjt8wQyHG%x{-=fB;#__9{KSiE76wfjc<
z7uv9n7?CxJge3?Y0cA(gSacRp-Wd?5@~5{uuNb^#pU>1o>9JI*E2AP^C=J=<EWOEq
zwQ-ZmQ-iTWgMX>%*&As6ZvOPP5`Y94Ir3Aw5la91=9bqoJt?bc`|)s$zO@mg6lB*)
zKF_r>w559hAukObyA}hGwrz*qP~WNT{fSK-iEy)>uMbE*9Bd^wk|Y|E0JMY+PV9}+
znMw|TI0+!{`&+v$tMx#(H`au|`c$&5Z#kaaNRnzz0e{feVshxc1Q?;CL&vT~<r5>b
zdqZb9Cd3l(*}fRB_lj30lN(9$-{Ykr?AdG}!|?>DVJW29zosn$z~K)%7+4nqpfI@%
zmnw~>$(5o*+%j0-?txbQQlRC_uN^-Jg}cl3h5Q2Ls<%R8g?vB@Qz-Yre6<c;G0t8n
zQ>sR}K7Z5B;D(i^<2N0uHN~!MjJl_}F&zceZP^hN3zMZrO>5m0n^Lc~plnJ<0mx6d
zsQUbZ8C1t*%Dnri?pDqh?>Wl`hFSqWsrk*j7bt$b=pX|3=PRS{yAqh|^#A<k>aEIy
z^1@PBQoz;c85Abrm+Kv91xjmv7^`q=a(dPbDt})#SJ}4hcu8;G^EmYOcd5>FkBW4$
z=o|P7{_pJIj)z?SS5v$*GuIN7a=(B7(Io%_AfM0I-`UYSCB5?HnOcigb=-}f?}c^H
zAn;s#x6EI~d8a%#b+)xJ@yTyz_W!-=Z?tVY3?!%hzV5P-9n{k5(FmoLKM@aZ|FPcu
h=N!@K=xF0b<{3_V82<=6Lm2=7002ovPDHLkV1n5*g^&OM

diff --git a/gosa-core/html/images/stop.png b/gosa-core/html/images/small-error.png
similarity index 100%
rename from gosa-core/html/images/stop.png
rename to gosa-core/html/images/small-error.png
diff --git a/gosa-core/html/images/status_running.png b/gosa-core/html/images/status_running.png
deleted file mode 100644
index 8d72794dd0f14442b856ab4aca6b23edcb8c5d4f..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 829
zcmV-D1H$}?P)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00004XF*Lt006JZ
zHwB960000PbVXQnQ*UN;cVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBU!&q+i<RCwBA
z{Qv(y0|;D6V+2v`e}6Ohu&^>jvIz;=F|l)Tfu#R@`}pnKt1pLs{9;(n$ilD%sP3ob
z5{N#40AgW40PcUk872uT3CD{##4~fM*fB72@iH(lGBW)C^qTwIokPLT_pJ<gdE?DO
z24;plp!%;MO#lG|H{kzYhGG#7ktC^@S_TGb7Y2sEe;FA5{RPW0a*Hx>%jhyFD=RTG
z&23J4dhNqQpl}mN4j_Qw2C%X-6pGvEGBAjWGcbHS3N{f1FfubRO2{zCIcPAvzIUP!
zW&l6{A-urGz{4y6bk*lGAWt)31%G)MSOh;ZFtRf6z=Qw-2yOt-wZHzqyUN1I^@o9h
znFHv8|7b1%2J*Kb4F5hoV)*-?0q#720D>Fv{WC+y%PU`-Bm^!oFtD&QFfcJ9G=t0n
z8Tj`n!{hUR7`}aE=z&QA1P~M41%DW(KRw5A{_AU?3s`_&`S%5Z{{u1WSBB3o{xCc^
z$#5R1b^=TvKmfrF_|M4j=KDK_ju#h!Y@h=ectH^h#X$CdHU@@AXMu6|mZ1X}jc;K3
z00IbZz~6sBSF<s!e{qIk&({w?0Y0c9yb$)6_Y4frPBH9ZW@lKB96SI4gfQSg*cHEj
zeP-DG=^4}jK_~{YKRf{@KcE~V6T@%humuPpcp(1$17$EXT=;l};j^$V11~5XnV?pD
zzQOPr7=0K1p+ycr0I{G%6G%VH|0A~_Xx+XtPt@q;%NGnEKYeES{^KVD`-``?Erb}3
z{6RASAb{WooYpLb1?RWFto+Oo(di5~Z{A_JbLSxg`}ZFVovnq;3pxIMgZck1R5d^V
z!40_b_&wZIW~L7;H*a5Nc=Y5M!<TQL7=8d<@Rx~|<<*b>7>N@gfEZ!fSzcZqk#7F~
zx7F6xNmf-=4LNY&;Lpd8AI<;#`O`+A)M1#KKYt*B1`uEXD1``7@-9f-00000NkvXX
Hu0mjfd9P)B

diff --git a/gosa-core/html/index.php b/gosa-core/html/index.php
index 5c7b5fbe3..b26380eeb 100644
--- a/gosa-core/html/index.php
+++ b/gosa-core/html/index.php
@@ -42,7 +42,7 @@ function displayLogin()
   }
   $smarty->assign ('date', gmdate("D, d M Y H:i:s"));
   $smarty->assign ('username', $username);
-  $smarty->assign ('personal_img', get_template_path('images/personal.png'));
+  $smarty->assign ('personal_img', get_template_path('images/login-head.png'));
   $smarty->assign ('password_img', get_template_path('images/password.png'));
   $smarty->assign ('directory_img', get_template_path('images/ldapserver.png'));
 
@@ -403,7 +403,7 @@ if (($_SERVER["REQUEST_METHOD"] == "POST" && isset($_POST['login'])) || $htacces
 /* Fill template with required values */
 $smarty->assign ('date', gmdate("D, d M Y H:i:s"));
 $smarty->assign ('username', $username);
-$smarty->assign ('personal_img', get_template_path('images/personal.png'));
+$smarty->assign ('personal_img', get_template_path('images/login-head.png'));
 $smarty->assign ('password_img', get_template_path('images/password.png'));
 $smarty->assign ('directory_img', get_template_path('images/ldapserver.png'));
 
diff --git a/gosa-core/html/main.php b/gosa-core/html/main.php
index 508cb8c10..6de3e86ac 100644
--- a/gosa-core/html/main.php
+++ b/gosa-core/html/main.php
@@ -291,7 +291,7 @@ $smarty->assign ("username", $ui->username);
 $smarty->assign ("go_logo", get_template_path('images/go_logo.png'));
 $smarty->assign ("go_base", get_template_path('images/dtree.png'));
 $smarty->assign ("go_home", get_template_path('images/gohome.png'));
-$smarty->assign ("go_out", get_template_path('images/stop.png'));
+$smarty->assign ("go_out", get_template_path('images/logout.png'));
 $smarty->assign ("go_top", get_template_path('images/go_top.png'));
 $smarty->assign ("go_corner", get_template_path('images/go_corner.png'));
 $smarty->assign ("go_left", get_template_path('images/go_left.png'));
diff --git a/gosa-core/html/images/list_new_acl_role.png b/gosa-core/html/plugins/acl/images/new-role.png
similarity index 100%
rename from gosa-core/html/images/list_new_acl_role.png
rename to gosa-core/html/plugins/acl/images/new-role.png
diff --git a/gosa-core/html/plugins/departments/images/department.png b/gosa-core/html/plugins/departments/images/department.png
new file mode 100644
index 0000000000000000000000000000000000000000..3d26af552952fe0cedd11eda61928b27dd923f6b
GIT binary patch
literal 713
zcmV;)0yh1LP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00004XF*Lt006JZ
zHwB960007jNkl<Zc$}4zPe@cz6vlt|Id95lba<%aXk%LDAI!qEO<~f;+DTw8+7(e4
zMz|;{Y7s=MTtqbpL7<DGMS(#CMPwpv60{Pd&<M$NbbKRC&OhhPJ1uf*kb?R)_rU$W
zbI(2e;4eA>o=<zYdl-5E=ihvP)M*#>i=7)s%<fv5DN}Mq=Lz8dr*Q8k4lQ<;hRmM*
zVxBCQi4r9<ekB7Qrrgl7)~{vPLzP_UXmQ<FhEYf)40ZxdgK!FVx>e<{k0*6-B)dV*
z>bYTh8-0F{>Q;J6!>vO+LS$&3L<qbFXgU~9<vdoT4labrdjrn^6u?esf8M4ZV6D!y
z0`sAD<es{P!wixNT*8yDAou5MB4YbS*k{480x&N%36alW*)SQ!EN-Q;rys4j5P)xE
z9|)dp!<(E!yuUwQ@IaI@4=JIx5rEjo71GT|NL3XPj70HouEu3A6JMGox2BcZ-kX$8
zJtW8R_16v@nXqYAQF8tw?#6l^b@+KYt>LcTM^kwLxf6YC?eb7}?K<ynZzpf~9)*cP
zsBI+YTubTY53$|SaN~}0mUsbh83sPXNtvNTbdfE453s&s7oOsc<Tvaf?5kn))t6+2
zH|_w~90&wtt)|CEW&Fisc|FiCpC-m6vYe1mC?s=pa}xf(EP+5k0KWtHycUjRa)p;y
zkCL8zOCAtxJ5KYN0P%Pn5h1oPpRvw3vV*p5W2MtXqj3tIEBJ~)*CFVziNz8mlSwSg
zA{L8fEioHKO#>^9jYhqH1DkYMN<qStN7}Lw5p-QgMA8`uvr+yZWeEN`L04Co0wmkf
vUR);RFDfIgVJ5_WKQtJRnn73Qel^1n&Myw=#5Ail00000NkvXXu0mjfw2nC-

literal 0
HcmV?d00001

diff --git a/gosa-core/html/plugins/generic/images/head.png b/gosa-core/html/plugins/generic/images/head.png
new file mode 100644
index 0000000000000000000000000000000000000000..83e5b318b8eb3b0e32a36e7e3c3b83c03b327179
GIT binary patch
literal 753
zcmV<N0uKF&P)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00004XF*Lt006JZ
zHwB9600080Nkl<Zc$|Hb-Ahw(9LAsD`JLCDxlK1+o0@JmCt_%h$WW>aBcr+v(tkjD
zqpPTkuDXgK5UPtXg1j*bf}$cSZxnaYi(r$)mYU|=T)yp9ch1hQD@CXFy?fyKJbd{+
zUts5uimtwkH~YpWp9iDK{^4ly>cinNTYX2@F5aEvK6(Ati;*mwUN%@buCZ`jV^b@P
z^$spGOT*djLO<Q6#A^S!Yj>X<^pr?b@hs*OIwGq&{w(F77O7a`tDAog^gjdi<OafR
z<)xaYR<YP+8INTVNg0S`3`Elg=8}1gN7696yl%O&p>->>JwOx`L83_HfptQlaU68Y
zVGRTcok5WW@RD4#mEpIF#N3Y%rzH)iy@WG~1{9HkF^2S-0mVeIxUi_FqTz`>H^AS}
z;Mcc(ubmbFUZ;YpQV~^U5<E^Bb~DAutKK(A%?JNi0$}x@=zI{;Kh0_^oHW>Y!eAd}
z8SCo#l7UjzQfQ|ITB^Hn=l=OKZMCAVVJ4nKY*7QJYp@jCh3OSuijRGKxo1F8pz~7K
z<r`PL4hkIrp#-1=>v;x6rZ81DHBO9<gtPHq-**eJ9P93RROhd9WO5oZ29VMik{UxY
z2drdt5LtoF7gtOU^*;rW-*!Z^uf4r7aL7-I4ql{?WD3>9LpAY`WC|)$2t-3&;OJp%
zRbcZMHUnx}PMt1us4y!8#YH?E76GL;9u6xHyOoE{%tMs{m)lOfjcx54+~yy+t844M
z`vhn?K$Qqo69<uUU|?9wG4Na-l0X2S!dY>^x8nv2GgE1c(|5eiTdr0*MK~=4E)!r=
z2vn88BvRxu1i^t|{N3Z*_cE)o5CD*Z8uvSVM>=X7ngd>sr`%>XtDqcG*|ltB=J#AU
j^!eN5=+JurlN-Q4SIze!Frs|m00000NkvXXu0mjfdKgzl

literal 0
HcmV?d00001

diff --git a/gosa-core/html/plugins/generic/images/plugin.png b/gosa-core/html/plugins/generic/images/plugin.png
new file mode 100644
index 0000000000000000000000000000000000000000..45e3c35289c964c4ff770145f16da92f2518fc6d
GIT binary patch
literal 4119
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
YKx@UNf*McN&mP#d-E-R`cTU3p0JG+L!2kdN

literal 0
HcmV?d00001

diff --git a/gosa-core/html/themes/default/style.css b/gosa-core/html/themes/default/style.css
index 2592cb8d1..d93a98534 100644
--- a/gosa-core/html/themes/default/style.css
+++ b/gosa-core/html/themes/default/style.css
@@ -471,7 +471,7 @@ div.tab_active {
 }
 
 div#notify {
-       background-image: url("../../images/lamp.png");
+       background-image: url("../../images/lists/on.png");
        background-repeat:no-repeat;
        background-position:1px 1px;
        padding-left:18px;
diff --git a/gosa-core/ihtml/themes/default/remove.tpl b/gosa-core/ihtml/themes/default/remove.tpl
index 2d063a133..d413beab7 100644
--- a/gosa-core/ihtml/themes/default/remove.tpl
+++ b/gosa-core/ihtml/themes/default/remove.tpl
@@ -1,5 +1,5 @@
 <div style="font-size:18px;">
-  <img alt="" src="images/button_cancel.png" align=top>&nbsp;{t}Warning{/t}
+  <img alt="" src="images/warning.png" align=top>&nbsp;{t}Warning{/t}
 </div>
 <p>
  {$intro}
diff --git a/gosa-core/plugins/admin/acl/class_divListACL.inc b/gosa-core/plugins/admin/acl/class_divListACL.inc
index 00f0a4b97..0105ecc2a 100644
--- a/gosa-core/plugins/admin/acl/class_divListACL.inc
+++ b/gosa-core/plugins/admin/acl/class_divListACL.inc
@@ -151,18 +151,18 @@ class divListACL extends MultiSelectWindow
     $listhead = MultiSelectWindow::get_default_header();
     $listhead .=  
       _("Base")."&nbsp;<select name='CurrentMainBase' onChange='mainform.submit()' class='center'>$options</select>".
-      " <input class='center' type='image' src='images/list_submit.png' align='middle' 
+      " <input class='center' type='image' src='images/lists/submit.png' align='middle' 
       title='"._("Submit department")."' name='submit_department' alt='".  _("Submit")."'>&nbsp;";
 
 
     /* Create Layers menu */
     $s  = ".|"._("Actions")."|\n";
-    $s .= "..|<img src='images/list_new.png' alt='' border='0' class='center'>".
+    $s .= "..|<img src='images/lists/new.png' alt='' border='0' class='center'>".
       "&nbsp;"._("Create")."|\n";
 
     /* Append create options */
     if(preg_match("/c/",$acl)) {
-      $s.= "...|<input class='center' type='image' src='images/list_new_acl_role.png' alt=''>".
+      $s.= "...|<input class='center' type='image' src='plugins/acl/images/new-role.png' alt=''>".
         "&nbsp;"._("Role")."|new_acl_role|\n";
     }
 
diff --git a/gosa-core/plugins/admin/acl/remove.tpl b/gosa-core/plugins/admin/acl/remove.tpl
index 9d13ebe6d..2e74cdcd8 100644
--- a/gosa-core/plugins/admin/acl/remove.tpl
+++ b/gosa-core/plugins/admin/acl/remove.tpl
@@ -1,5 +1,5 @@
 <div style="font-size:18px;">
-<img alt="" src="images/button_cancel.png" align=top>&nbsp;{t}Warning{/t}
+<img alt="" src="images/warning.png" align=top>&nbsp;{t}Warning{/t}
 </div>
 <p>
  {$info}
diff --git a/gosa-core/plugins/admin/departments/class_divListDepartment.inc b/gosa-core/plugins/admin/departments/class_divListDepartment.inc
index b56e5b3bd..1e451ddd4 100644
--- a/gosa-core/plugins/admin/departments/class_divListDepartment.inc
+++ b/gosa-core/plugins/admin/departments/class_divListDepartment.inc
@@ -142,12 +142,12 @@ class divListDepartment extends MultiSelectWindow
 
     $listhead .=  
       " "._("Base")."&nbsp;<select name='CurrentMainBase' onChange='mainform.submit()' class='center'>$options</select>".
-      " <input class='center' type='image' src='images/list_submit.png' align='middle' ".
+      " <input class='center' type='image' src='images/lists/submit.png' align='middle' ".
       "   title='"._("Submit department")."' name='submit_department' alt='"._("Submit")."'>&nbsp;";
 
     /* Create Layers menu */
     $s  = ".|"._("Actions")."|\n";
-    $s .= "..|<img src='images/list_new.png' alt='' border='0' class='center'>".
+    $s .= "..|<img src='images/lists/new.png' alt='' border='0' class='center'>".
       "&nbsp;"._("Create")."|\n";
 
     /* Append create options */
diff --git a/gosa-core/plugins/admin/departments/dep_move_confirm.tpl b/gosa-core/plugins/admin/departments/dep_move_confirm.tpl
index a18e7932c..0ca303959 100644
--- a/gosa-core/plugins/admin/departments/dep_move_confirm.tpl
+++ b/gosa-core/plugins/admin/departments/dep_move_confirm.tpl
@@ -1,5 +1,5 @@
 <div style="font-size:18px;">
- <img alt="" src="images/button_cancel.png" align=top>&nbsp;{t}Warning{/t} - {t}You are currently moving/renaming this department.{/t}
+ <img alt="" src="images/warning.png" align=top>&nbsp;{t}Warning{/t} - {t}You are currently moving/renaming this department.{/t}
 </div>
 <p>
 {t}Modifying a departments naming attribute 'ou' or base may corrupt acls and snapshot entries for all entire objects.{/t}
diff --git a/gosa-core/plugins/admin/departments/generic.tpl b/gosa-core/plugins/admin/departments/generic.tpl
index 36921ad1e..da26e94d7 100644
--- a/gosa-core/plugins/admin/departments/generic.tpl
+++ b/gosa-core/plugins/admin/departments/generic.tpl
@@ -53,7 +53,7 @@
     &nbsp;
    </td>
    <td>
-     <h2><img class="center" alt="" align="middle" src="images/house.png"> {t}Location{/t}</h2>
+     <h2><img class="center" alt="" align="middle" src="plugins/departments/images/department.png"> {t}Location{/t}</h2>
 
      <table summary="" style="width:100%">
       <tr>
diff --git a/gosa-core/plugins/admin/departments/remove.tpl b/gosa-core/plugins/admin/departments/remove.tpl
index 36b1fa89a..ce2f63071 100644
--- a/gosa-core/plugins/admin/departments/remove.tpl
+++ b/gosa-core/plugins/admin/departments/remove.tpl
@@ -1,5 +1,5 @@
 <div style="font-size:18px;">
- <img alt="" src="images/button_cancel.png" align=top>&nbsp;{t}Warning{/t}
+ <img alt="" src="images/warning.png" align=top>&nbsp;{t}Warning{/t}
 </div>
 <p>
  {$info}
diff --git a/gosa-core/plugins/admin/groups/class_divListGroup.inc b/gosa-core/plugins/admin/groups/class_divListGroup.inc
index 0e40cd438..543509df3 100644
--- a/gosa-core/plugins/admin/groups/class_divListGroup.inc
+++ b/gosa-core/plugins/admin/groups/class_divListGroup.inc
@@ -173,13 +173,13 @@ class divListGroup extends MultiSelectWindow
     
     /* Add department selection */
     $listhead .= _("Base")."&nbsp;<select name='CurrentMainBase' onChange='mainform.submit()' class='center'>$options</select>".
-      " <input type='image' class='center' src='images/list_submit.png' title='"._("Submit department")."' name='submit_department' alt='"._("Submit").
+      " <input type='image' class='center' src='images/lists/submit.png' title='"._("Submit department")."' name='submit_department' alt='"._("Submit").
       "'>&nbsp;";
 
 
         /* Create Layers menu */
     $s  = ".|"._("Actions")."|\n";
-    $s .= "..|<img src='images/list_new.png' alt='' border='0' class='center'>".
+    $s .= "..|<img src='images/lists/new.png' alt='' border='0' class='center'>".
       "&nbsp;"._("Create")."|\n";
 
 
diff --git a/gosa-core/plugins/admin/groups/class_groupGeneric.inc b/gosa-core/plugins/admin/groups/class_groupGeneric.inc
index a0f4fc79f..1e78305ba 100644
--- a/gosa-core/plugins/admin/groups/class_groupGeneric.inc
+++ b/gosa-core/plugins/admin/groups/class_groupGeneric.inc
@@ -231,7 +231,7 @@ class group extends plugin
 
     /* Do we represent a valid group? */
     if (!$this->is_account && $this->parent === NULL){
-      $display= "<img alt=\"\" src=\"images/stop.png\" align=\"middle\">&nbsp;<b>".msgPool::noValidExtension()."</b>";
+      $display= "<img alt=\"\" src=\"images/small-error.png\" align=\"middle\">&nbsp;<b>".msgPool::noValidExtension()."</b>";
       return ($display);
     }
 
diff --git a/gosa-core/plugins/admin/groups/remove.tpl b/gosa-core/plugins/admin/groups/remove.tpl
index c4405a19e..39157da1a 100644
--- a/gosa-core/plugins/admin/groups/remove.tpl
+++ b/gosa-core/plugins/admin/groups/remove.tpl
@@ -1,5 +1,5 @@
 <div style="font-size:18px;">
-  <img alt="" src="images/button_cancel.png" align=top>&nbsp;{t}Warning{/t}
+  <img alt="" src="images/warning.png" align=top>&nbsp;{t}Warning{/t}
 </div>
 <p>
   {$info}
diff --git a/gosa-core/plugins/admin/ogroups/class_divListOGroup.inc b/gosa-core/plugins/admin/ogroups/class_divListOGroup.inc
index 3201b5c6c..dfd5acb46 100644
--- a/gosa-core/plugins/admin/ogroups/class_divListOGroup.inc
+++ b/gosa-core/plugins/admin/ogroups/class_divListOGroup.inc
@@ -191,13 +191,13 @@ class divListOGroup extends MultiSelectWindow
   
     /* Add department selector */
     $listhead .= _("Base")."&nbsp;<select name='CurrentMainBase' onChange='mainform.submit()' class='center'>$options</select>".
-      " <input class='center' type='image' src='images/list_submit.png' align='middle' 
+      " <input class='center' type='image' src='images/lists/submit.png' align='middle' 
       title='"._("Submit department")."' name='submit_department' alt='"._("Submit")."'>&nbsp;";
 
 
     /* Create Layers menu */
     $s  = ".|"._("Actions")."|\n";
-    $s .= "..|<img src='images/list_new.png' alt='' border='0' class='center'>".
+    $s .= "..|<img src='images/lists/new.png' alt='' border='0' class='center'>".
       "&nbsp;"._("Create")."|\n";
 
     /* Append create options */
diff --git a/gosa-core/plugins/admin/ogroups/class_ogroup.inc b/gosa-core/plugins/admin/ogroups/class_ogroup.inc
index ea6abd637..fa0c66ca1 100644
--- a/gosa-core/plugins/admin/ogroups/class_ogroup.inc
+++ b/gosa-core/plugins/admin/ogroups/class_ogroup.inc
@@ -186,7 +186,7 @@ class ogroup extends plugin
 
     /* Do we represent a valid group? */
     if (!$this->is_account){
-      $display= "<img alt=\"\" src=\"images/stop.png\" align=\"middle\">&nbsp;<b>".
+      $display= "<img alt=\"\" src=\"images/small-error.png\" align=\"middle\">&nbsp;<b>".
         msgPool::noValidExtension("object group")."</b>";
       return ($display);
     }
diff --git a/gosa-core/plugins/admin/ogroups/remove.tpl b/gosa-core/plugins/admin/ogroups/remove.tpl
index 1f244deee..2b809b9b5 100644
--- a/gosa-core/plugins/admin/ogroups/remove.tpl
+++ b/gosa-core/plugins/admin/ogroups/remove.tpl
@@ -1,5 +1,5 @@
 <div style="font-size:18px;">
-  <img alt="" src="images/button_cancel.png" align=top>&nbsp;{t}Warning{/t}
+  <img alt="" src="images/warning.png" align=top>&nbsp;{t}Warning{/t}
 </div>
 
 <p>
diff --git a/gosa-core/plugins/admin/users/class_divListUsers.inc b/gosa-core/plugins/admin/users/class_divListUsers.inc
index 15401fbeb..5117b0b09 100644
--- a/gosa-core/plugins/admin/users/class_divListUsers.inc
+++ b/gosa-core/plugins/admin/users/class_divListUsers.inc
@@ -160,20 +160,20 @@ class divListUsers extends MultiSelectWindow
     $listhead = MultiSelectWindow::get_default_header();
     $listhead .=
       _("Base")."&nbsp;<select name='CurrentMainBase' onChange='mainform.submit()' class='center'>$options</select>".
-      " <input class='center' type='image' src='images/list_submit.png' align='middle' 
+      " <input class='center' type='image' src='images/lists/submit.png' align='middle' 
       title='"._("Submit department")."' name='submit_department' alt='".  _("Submit")."'>&nbsp;";
 
 
     /* Create Layers menu */
     $s  = ".|"._("Actions")."|\n";
-    $s .= "..|<img src='images/list_new.png' alt='' border='0' class='center'>".
+    $s .= "..|<img src='images/lists/new.png' alt='' border='0' class='center'>".
       "&nbsp;"._("Create")."|\n";
 
     /* Append create options */
     if(preg_match("/c/",$acl)) {
       $s.= "...|<input class='center' type='image' src='images/list_new_user.png' alt=''>".
         "&nbsp;"._("User")."|user_new|\n";
-      $s.= "...|<input class='center' type='image' src='images/list_new.png' alt=''>".
+      $s.= "...|<input class='center' type='image' src='images/lists/new.png' alt=''>".
         "&nbsp;"._("Template")."|user_tplnew|\n";
     }
 
@@ -281,7 +281,7 @@ class divListUsers extends MultiSelectWindow
                     name='user_edit_%KEY%-sambaAccount' title='"._("Edit samba properties")."'>";
     $netatalkimg = "<input class='center' type='image' src='images/select_netatalk.png' alt='"._("Netatalk")."'
                     name='user_edit_%KEY%-netatalk' title='"._("Edit netatalk properties")."'>";
-    $tplcreateuserimg  = "<input type='image' class='center' src='images/list_new.png' alt='"._("Create user from template")."'
+    $tplcreateuserimg  = "<input type='image' class='center' src='images/lists/new.png' alt='"._("Create user from template")."'
                     name='userfrom_tpl_%KEY%' title='"._("Create user with this template")."'>";
 
     /********************
diff --git a/gosa-core/plugins/admin/users/remove.tpl b/gosa-core/plugins/admin/users/remove.tpl
index 3d9af5de5..8424e7401 100644
--- a/gosa-core/plugins/admin/users/remove.tpl
+++ b/gosa-core/plugins/admin/users/remove.tpl
@@ -1,5 +1,5 @@
 <div style="font-size:18px;">
- <img alt="" src="images/button_cancel.png" align=top>&nbsp;{t}Warning{/t}
+ <img alt="" src="images/warning.png" align=top>&nbsp;{t}Warning{/t}
 </div>
 <p>
   {$info}
diff --git a/gosa-core/plugins/personal/generic/class_user.inc b/gosa-core/plugins/personal/generic/class_user.inc
index 15ab39c97..8d4e92706 100644
--- a/gosa-core/plugins/personal/generic/class_user.inc
+++ b/gosa-core/plugins/personal/generic/class_user.inc
@@ -308,7 +308,7 @@ class user extends plugin
 
     /* Do we represent a valid gosaAccount? */
     if (!$this->is_account){
-      $str = "<img alt=\"\" src=\"images/stop.png\" align=\"middle\">&nbsp;<b>".
+      $str = "<img alt=\"\" src=\"images/small-error.png\" align=\"middle\">&nbsp;<b>".
         msgPool::noValidExtension("GOsa")."</b>";
       return($str);
     }
diff --git a/gosa-core/plugins/personal/generic/generic.tpl b/gosa-core/plugins/personal/generic/generic.tpl
index a0130e8f2..0908aa51d 100644
--- a/gosa-core/plugins/personal/generic/generic.tpl
+++ b/gosa-core/plugins/personal/generic/generic.tpl
@@ -3,7 +3,7 @@
  <!-- Headline container -->
  <tr>
   <td colspan="4">
-   <h2><img alt="" align="middle" src="images/head.png" class="center"> {t}Personal information{/t}</h2>
+   <h2><img alt="" align="middle" src="plugins/generic/images/head.png" class="center"> {t}Personal information{/t}</h2>
   </td>
  </tr>
 
diff --git a/gosa-core/plugins/personal/generic/generic_picture.tpl b/gosa-core/plugins/personal/generic/generic_picture.tpl
index 3ca587734..de7225509 100644
--- a/gosa-core/plugins/personal/generic/generic_picture.tpl
+++ b/gosa-core/plugins/personal/generic/generic_picture.tpl
@@ -2,7 +2,7 @@
  <!-- Headline container -->
  <tr>
    <td colspan=2>
-     <h2><img alt="" class="center" align="middle" src="images/head.png"> {t}Personal picture{/t}</h2>
+     <h2><img alt="" class="center" align="middle" src="plugins/generic/images/head.png"> {t}Personal picture{/t}</h2>
    </td>
  </tr>
  <!-- Base container -->
diff --git a/gosa-core/plugins/personal/generic/main.inc b/gosa-core/plugins/personal/generic/main.inc
index 0b6dcdcc2..4f5b33c24 100644
--- a/gosa-core/plugins/personal/generic/main.inc
+++ b/gosa-core/plugins/personal/generic/main.inc
@@ -179,7 +179,7 @@ if (!$remove_lock){
       /* Only display edit button if there is at least one attribute editable */
       if(preg_match("/w/",$ui->get_permissions($ui->dn,"users/user"))){
         if ($fn == "edit"){
-          $info.= "<img class=\"center\" alt=\"\" align=\"middle\" src=\"".get_template_path('images/lamp.png')."\"> ".
+          $info.= "<img class=\"center\" alt=\"\" align=\"middle\" src=\"".get_template_path('images/lists/on.png')."\"> ".
             msgPool::clickEditToChange();
           $display.= "<input type=submit name=\"$fn\" value=\"$str\">\n";
         }
@@ -191,7 +191,7 @@ if (!$remove_lock){
   }
 
   /* Page header*/
-  $display= print_header(get_template_path('images/personal.png'),
+  $display= print_header(get_template_path('plugins/generic/images/plugin.png'),
                          _("Generic user information"), $info).$display;
 
 }
diff --git a/gosa-core/plugins/personal/posix/class_posixAccount.inc b/gosa-core/plugins/personal/posix/class_posixAccount.inc
index 6fb52cc3e..cf1dae04f 100644
--- a/gosa-core/plugins/personal/posix/class_posixAccount.inc
+++ b/gosa-core/plugins/personal/posix/class_posixAccount.inc
@@ -271,7 +271,7 @@ class posixAccount extends plugin
 
       /* Do we represent a valid posixAccount? */
       if (!$this->is_account && $this->parent === NULL ){
-        $display= "<img alt=\"\" src=\"images/stop.png\" align=\"middle\">&nbsp;<b>".
+        $display= "<img alt=\"\" src=\"images/small-error.png\" align=\"middle\">&nbsp;<b>".
           msgPool::noValidExtension(_("POSIX"))."</b>";
         $display.= back_to_main();
         return ($display);
diff --git a/gosa-core/plugins/personal/posix/main.inc b/gosa-core/plugins/personal/posix/main.inc
index 5199eb73c..0ce027772 100644
--- a/gosa-core/plugins/personal/posix/main.inc
+++ b/gosa-core/plugins/personal/posix/main.inc
@@ -116,7 +116,7 @@ if (!$remove_lock){
 
       /* Only display edit button if there is at least one attribute editable */
       if(preg_match("/w/",$ui->get_permissions($ui->dn,"users/posixAccount"))){
-        $info.= "<img alt=\"\" align=\"middle\" src=\"".get_template_path('images/lamp.png')."\"> ".
+        $info.= "<img alt=\"\" align=\"middle\" src=\"".get_template_path('images/lists/on.png')."\"> ".
           msgPool::clickEditToChange();
 
         $display.= "<input type=submit name=\"edit\" value=\"".msgPool::editButton()."\">\n";
-- 
2.30.2