17 files changed, 28 insertions, 9 deletions
diff --git a/MANIFEST b/MANIFEST
index 57a61e5d..f60d5e00 100644
--- a/MANIFEST
+++ b/MANIFEST
@@ -87,6 +87,13 @@ share/images/Down_16x16.png
 share/images/Down_32x32.png
 share/images/logo_mageia.png
 share/images/mageia.png
+share/images/manaclock.png
+share/images/manahost.png
+share/images/manalog.png
+share/images/manaproxy.png
+share/images/manaservice.png
+share/images/manauser.png
+share/images/mpan.png
 share/images/quit.png
 share/images/Up.png
 share/images/Up_16x16.png
diff --git a/README.md b/README.md
index c874267a..acc6d184 100644
--- a/README.md
+++ b/README.md
@@ -97,3 +97,15 @@ if not, write to the Free Software Foundation, Inc.,
 NOTE: some icons are under the license:
 Creative Commons Attribution-No Derivative Works 3.0 Unported 
 http://creativecommons.org/licenses/by-nd/3.0/
+
+NOTE 1: 
+To avoid file name duplication we renamed icon from drakxtools,
+rpmdrake and userdrake, to fit new naming convention:
+time-mdk      -> manaclock
+drakhosts     -> manahost
+logdrake-mdk  -> manalog
+drakproxy-mdk -> manaproxy
+service-mdk   -> manaservice
+userdrake     -> manauser
+drakconf      -> mpan
+
diff --git a/extras/desktop/manaclock.desktop b/extras/desktop/manaclock.desktop
index dcb87a53..91aae5c6 100644
--- a/extras/desktop/manaclock.desktop
+++ b/extras/desktop/manaclock.desktop
@@ -2,7 +2,7 @@
 Name=manaclock
 Comment=AdminPanel clock manager
 Exec=pkexec /usr/bin/manaclock
-Icon=time-mdk
+Icon=manaclock
 Type=Application
 StartupNotify=true
 Categories=System;X-MandrivaLinux-CrossDesktop;
diff --git a/extras/desktop/manahost.desktop b/extras/desktop/manahost.desktop
index e9afd90c..f53c218f 100644
--- a/extras/desktop/manahost.desktop
+++ b/extras/desktop/manahost.desktop
@@ -2,7 +2,7 @@
 Name=manahost
 Comment=AdminPanel host manager
 Exec=pkexec /usr/bin/manahost
-Icon=drakhosts
+Icon=manahost
 Type=Application
 StartupNotify=true
 Categories=System;X-MandrivaLinux-CrossDesktop;
diff --git a/extras/desktop/manalog.desktop b/extras/desktop/manalog.desktop
index 881bb1d0..60429cb7 100644
--- a/extras/desktop/manalog.desktop
+++ b/extras/desktop/manalog.desktop
@@ -2,7 +2,7 @@
 Name=manalog admin mode
 Comment=AdminPanel log viewer
 Exec=pkexec /usr/bin/manalog
-Icon=logdrake-mdk
+Icon=manalog
 Type=Application
 StartupNotify=true
 Categories=System;X-MandrivaLinux-CrossDesktop;
diff --git a/extras/desktop/manaproxy.desktop b/extras/desktop/manaproxy.desktop
index f4c59048..a20281d5 100644
--- a/extras/desktop/manaproxy.desktop
+++ b/extras/desktop/manaproxy.desktop
@@ -1,8 +1,8 @@
 [Desktop Entry]
 Name=manaproxy
 Comment=AdminPanel proxy manager
-Exec=pkexec /usr/bin/manauser
-Icon=drakproxy-mdk
+Exec=pkexec /usr/bin/manaproxy
+Icon=manaproxy
 Type=Application
 StartupNotify=true
 Categories=System;X-MandrivaLinux-CrossDesktop;
diff --git a/extras/desktop/manaservice.desktop b/extras/desktop/manaservice.desktop
index 9bd9bf3b..ad6cd637 100644
--- a/extras/desktop/manaservice.desktop
+++ b/extras/desktop/manaservice.desktop
@@ -2,7 +2,7 @@
 Name=manaservice
 Comment=AdminPanel service manager
 Exec=pkexec /usr/bin/manaservice
-Icon=service-mdk
+Icon=manaservice
 Type=Application
 StartupNotify=true
 Categories=System;X-MandrivaLinux-CrossDesktop;
diff --git a/extras/desktop/manauser.desktop b/extras/desktop/manauser.desktop
index 417a31ad..42145120 100644
--- a/extras/desktop/manauser.desktop
+++ b/extras/desktop/manauser.desktop
@@ -2,7 +2,7 @@
 Name=manauser
 Comment=AdminPanel user manager
 Exec=pkexec /usr/bin/manauser
-Icon=userdrake
+Icon=manauser
 Type=Application
 StartupNotify=true
 Categories=System;X-MandrivaLinux-CrossDesktop;
diff --git a/extras/desktop/manauserlog.desktop b/extras/desktop/manauserlog.desktop
index 1d12ca20..57de1653 100644
--- a/extras/desktop/manauserlog.desktop
+++ b/extras/desktop/manauserlog.desktop
@@ -2,7 +2,7 @@
 Name=manalog user mode
 Comment=AdminPanel log viewer
 Exec=/usr/bin/manalog
-Icon=logdrake-mdk
+Icon=manalog
 Type=Application
 StartupNotify=true
 Categories=System;X-MandrivaLinux-CrossDesktop;
diff --git a/extras/desktop/mpan.desktop b/extras/desktop/mpan.desktop
index 8a8f9512..e7c4890a 100644
--- a/extras/desktop/mpan.desktop
+++ b/extras/desktop/mpan.desktop
@@ -2,7 +2,7 @@
 Name=Mageia AdminPanel
 Comment=Administration panel - application launcher
 Exec=pkexec /usr/bin/mpan.pl
-Icon=drakconf
+Icon=mpan
 Type=Application
 StartupNotify=true
 Categories=System;X-MandrivaLinux-CrossDesktop;
diff --git a/share/images/manaclock.png b/share/images/manaclock.png
new file mode 100644
index 00000000..48340078
--- /dev/null
+++ b/share/images/manaclock.png
diff --git a/share/images/manahost.png b/share/images/manahost.png
new file mode 100644
index 00000000..96370d1e
--- /dev/null
+++ b/share/images/manahost.png
diff --git a/share/images/manalog.png b/share/images/manalog.png
new file mode 100644
index 00000000..620b4c02
--- /dev/null
+++ b/share/images/manalog.png
diff --git a/share/images/manaproxy.png b/share/images/manaproxy.png
new file mode 100644
index 00000000..0351de84
--- /dev/null
+++ b/share/images/manaproxy.png
diff --git a/share/images/manaservice.png b/share/images/manaservice.png
new file mode 100644
index 00000000..6f3ee482
--- /dev/null
+++ b/share/images/manaservice.png
diff --git a/share/images/manauser.png b/share/images/manauser.png
new file mode 100644
index 00000000..da2eb752
--- /dev/null
+++ b/share/images/manauser.png
diff --git a/share/images/mpan.png b/share/images/mpan.png
new file mode 100644
index 00000000..b8544494
--- /dev/null
+++ b/share/images/mpan.png