diff --git a/docs/changelog/6.x.x.txt b/docs/changelog/6.x.x.txt
index f37d68094..6a47f316f 100644
--- a/docs/changelog/6.x.x.txt
+++ b/docs/changelog/6.x.x.txt
@@ -3,6 +3,7 @@
    visitors.
  - Bugfix [ 884375 ] Fix for multiple forum posts applied also to
    www_viewForum to handle postings that start a new thread.
+ - Added German toolbar icons.
 
 
 6.0.1
diff --git a/docs/upgrades/upgrade_6.0.1-6.0.2.sql b/docs/upgrades/upgrade_6.0.1-6.0.2.sql
index de4283b2c..10ab853eb 100644
--- a/docs/upgrades/upgrade_6.0.1-6.0.2.sql
+++ b/docs/upgrades/upgrade_6.0.1-6.0.2.sql
@@ -1,2 +1,4 @@
 insert into webguiVersion values ('6.0.2','upgrade',unix_timestamp());
+update language set toolbar='german' where languageId=2;
+alter table language change toolbar toolbar varchar(35) not null default 'metal';
 
diff --git a/www/extras/toolbar/german/copy.gif b/www/extras/toolbar/german/copy.gif
new file mode 100644
index 000000000..995e52b4b
Binary files /dev/null and b/www/extras/toolbar/german/copy.gif differ
diff --git a/www/extras/toolbar/german/cut.gif b/www/extras/toolbar/german/cut.gif
new file mode 100644
index 000000000..2b2650915
Binary files /dev/null and b/www/extras/toolbar/german/cut.gif differ
diff --git a/www/extras/toolbar/german/delete.gif b/www/extras/toolbar/german/delete.gif
new file mode 100644
index 000000000..d94f9f872
Binary files /dev/null and b/www/extras/toolbar/german/delete.gif differ
diff --git a/www/extras/toolbar/german/drag.gif b/www/extras/toolbar/german/drag.gif
new file mode 100644
index 000000000..9bdb2bb77
Binary files /dev/null and b/www/extras/toolbar/german/drag.gif differ
diff --git a/www/extras/toolbar/german/edit.gif b/www/extras/toolbar/german/edit.gif
new file mode 100644
index 000000000..4709403ce
Binary files /dev/null and b/www/extras/toolbar/german/edit.gif differ
diff --git a/www/extras/toolbar/german/help.gif b/www/extras/toolbar/german/help.gif
new file mode 100644
index 000000000..dbed2f067
Binary files /dev/null and b/www/extras/toolbar/german/help.gif differ
diff --git a/www/extras/toolbar/german/manage.gif b/www/extras/toolbar/german/manage.gif
new file mode 100644
index 000000000..0836670ab
Binary files /dev/null and b/www/extras/toolbar/german/manage.gif differ
diff --git a/www/extras/toolbar/german/moveBottom.gif b/www/extras/toolbar/german/moveBottom.gif
new file mode 100644
index 000000000..55d07ee9c
Binary files /dev/null and b/www/extras/toolbar/german/moveBottom.gif differ
diff --git a/www/extras/toolbar/german/moveDown.gif b/www/extras/toolbar/german/moveDown.gif
new file mode 100644
index 000000000..93b457b02
Binary files /dev/null and b/www/extras/toolbar/german/moveDown.gif differ
diff --git a/www/extras/toolbar/german/moveLeft.gif b/www/extras/toolbar/german/moveLeft.gif
new file mode 100644
index 000000000..73276ee35
Binary files /dev/null and b/www/extras/toolbar/german/moveLeft.gif differ
diff --git a/www/extras/toolbar/german/moveRight.gif b/www/extras/toolbar/german/moveRight.gif
new file mode 100644
index 000000000..222aa8328
Binary files /dev/null and b/www/extras/toolbar/german/moveRight.gif differ
diff --git a/www/extras/toolbar/german/moveTop.gif b/www/extras/toolbar/german/moveTop.gif
new file mode 100644
index 000000000..28b41929d
Binary files /dev/null and b/www/extras/toolbar/german/moveTop.gif differ
diff --git a/www/extras/toolbar/german/moveUp.gif b/www/extras/toolbar/german/moveUp.gif
new file mode 100644
index 000000000..745eaf120
Binary files /dev/null and b/www/extras/toolbar/german/moveUp.gif differ
diff --git a/www/extras/toolbar/german/page.gif b/www/extras/toolbar/german/page.gif
new file mode 100644
index 000000000..fa912fc5d
Binary files /dev/null and b/www/extras/toolbar/german/page.gif differ
diff --git a/www/extras/toolbar/german/paste.gif b/www/extras/toolbar/german/paste.gif
new file mode 100644
index 000000000..57df587a6
Binary files /dev/null and b/www/extras/toolbar/german/paste.gif differ
diff --git a/www/extras/toolbar/german/shortcut.gif b/www/extras/toolbar/german/shortcut.gif
new file mode 100644
index 000000000..6521e7886
Binary files /dev/null and b/www/extras/toolbar/german/shortcut.gif differ
diff --git a/www/extras/toolbar/german/view.gif b/www/extras/toolbar/german/view.gif
new file mode 100644
index 000000000..f32344044
Binary files /dev/null and b/www/extras/toolbar/german/view.gif differ
diff --git a/www/extras/toolbar/german/wobject.gif b/www/extras/toolbar/german/wobject.gif
new file mode 100644
index 000000000..df14bf290
Binary files /dev/null and b/www/extras/toolbar/german/wobject.gif differ