Bring printer1 icon into XDG compliance

diff --git a/pics/crystalsvg/cr128-device-printer.png b/pics/crystalsvg/cr128-device-printer.png
new file mode 100644
index 0000000..7db5f56
--- /dev/null
+++ b/pics/crystalsvg/cr128-device-printer.png
Binary files differ
diff --git a/pics/crystalsvg/cr128-device-printer1.png b/pics/crystalsvg/cr128-device-printer1.png
deleted file mode 100644
index 7db5f56..0000000
--- a/pics/crystalsvg/cr128-device-printer1.png
+++ /dev/null
Binary files differ
diff --git a/pics/crystalsvg/cr16-device-printer.png b/pics/crystalsvg/cr16-device-printer.png
new file mode 100644
index 0000000..d6defce
--- /dev/null
+++ b/pics/crystalsvg/cr16-device-printer.png
Binary files differ
diff --git a/pics/crystalsvg/cr16-device-printer1.png b/pics/crystalsvg/cr16-device-printer1.png
deleted file mode 100644
index d6defce..0000000
--- a/pics/crystalsvg/cr16-device-printer1.png
+++ /dev/null
Binary files differ
diff --git a/pics/crystalsvg/cr22-device-printer.png b/pics/crystalsvg/cr22-device-printer.png
new file mode 100644
index 0000000..a71ee28
--- /dev/null
+++ b/pics/crystalsvg/cr22-device-printer.png
Binary files differ
diff --git a/pics/crystalsvg/cr22-device-printer1.png b/pics/crystalsvg/cr22-device-printer1.png
deleted file mode 100644
index a71ee28..0000000
--- a/pics/crystalsvg/cr22-device-printer1.png
+++ /dev/null
Binary files differ
diff --git a/pics/crystalsvg/cr32-device-printer.png b/pics/crystalsvg/cr32-device-printer.png
new file mode 100644
index 0000000..d554b55
--- /dev/null
+++ b/pics/crystalsvg/cr32-device-printer.png
Binary files differ
diff --git a/pics/crystalsvg/cr32-device-printer1.png b/pics/crystalsvg/cr32-device-printer1.png
deleted file mode 100644
index d554b55..0000000
--- a/pics/crystalsvg/cr32-device-printer1.png
+++ /dev/null
Binary files differ
diff --git a/pics/crystalsvg/cr48-device-printer.png b/pics/crystalsvg/cr48-device-printer.png
new file mode 100644
index 0000000..13adbd0
--- /dev/null
+++ b/pics/crystalsvg/cr48-device-printer.png
Binary files differ
diff --git a/pics/crystalsvg/cr48-device-printer1.png b/pics/crystalsvg/cr48-device-printer1.png
deleted file mode 100644
index 13adbd0..0000000
--- a/pics/crystalsvg/cr48-device-printer1.png
+++ /dev/null
Binary files differ
diff --git a/pics/crystalsvg/cr64-device-printer.png b/pics/crystalsvg/cr64-device-printer.png
new file mode 100644
index 0000000..5d22d21
--- /dev/null
+++ b/pics/crystalsvg/cr64-device-printer.png
Binary files differ
diff --git a/pics/crystalsvg/cr64-device-printer1.png b/pics/crystalsvg/cr64-device-printer1.png
deleted file mode 100644
index 5d22d21..0000000
--- a/pics/crystalsvg/cr64-device-printer1.png
+++ /dev/null
Binary files differ
diff --git a/tdecore/tdehw/tdehardwaredevices.cpp b/tdecore/tdehw/tdehardwaredevices.cpp
index 4fec70e..475f470 100644
--- a/tdecore/tdehw/tdehardwaredevices.cpp
+++ b/tdecore/tdehw/tdehardwaredevices.cpp
@@ -4167,7 +4167,7 @@
 		ret = DesktopIcon("kcmpci", size);
 	}
 	else if (query == TDEGenericDeviceType::Printer) {
-		ret = DesktopIcon("printer1", size);
+		ret = DesktopIcon("printer", size);
 	}
 	else if (query == TDEGenericDeviceType::Scanner) {
 		ret = DesktopIcon("scanner", size);
diff --git a/tdeprint/management/kmmainview.cpp b/tdeprint/management/kmmainview.cpp
index 879c00e..ce3f356 100644
--- a/tdeprint/management/kmmainview.cpp
+++ b/tdeprint/management/kmmainview.cpp
@@ -286,7 +286,7 @@
 	m_actions->action("printer_tool")->plug( menu );
 	menu->insertSeparator();
 	//m_menubar->insertItem( i18n( "Printer" ), menu );
-	m_menubar->insertButton( "printer1", 1, true, i18n( "Printer" ) );
+	m_menubar->insertButton( "printer", 1, true, i18n( "Printer" ) );
 	m_menubar->getButton( 1 )->setPopup( menu, true );
 	menu = new TQPopupMenu( this );
 	m_actions->action("server_restart")->plug( menu );