diff --git a/comp/src/gb.form.stock/gambas-mono/32/office-presentation.png b/comp/src/gb.form.stock/gambas-mono/32/office-presentation.png
new file mode 100644
index 000000000..3dfe915fb
Binary files /dev/null and b/comp/src/gb.form.stock/gambas-mono/32/office-presentation.png differ
diff --git a/comp/src/gb.form.stock/gambas/128/component.png b/comp/src/gb.form.stock/gambas/128/component.png
index e9f4414ea..d7af352fc 100644
Binary files a/comp/src/gb.form.stock/gambas/128/component.png and b/comp/src/gb.form.stock/gambas/128/component.png differ
diff --git a/comp/src/gb.form.stock/gambas/128/group.png b/comp/src/gb.form.stock/gambas/128/group.png
new file mode 100644
index 000000000..eaa747f71
Binary files /dev/null and b/comp/src/gb.form.stock/gambas/128/group.png differ
diff --git a/comp/src/gb.form.stock/gambas/128/linux.png b/comp/src/gb.form.stock/gambas/128/linux.png
index 44e79df43..3ab2b0990 100644
Binary files a/comp/src/gb.form.stock/gambas/128/linux.png and b/comp/src/gb.form.stock/gambas/128/linux.png differ
diff --git a/comp/src/gb.form.stock/gambas/128/office-calc.png b/comp/src/gb.form.stock/gambas/128/office-calc.png
new file mode 100644
index 000000000..6abf1db57
Binary files /dev/null and b/comp/src/gb.form.stock/gambas/128/office-calc.png differ
diff --git a/comp/src/gb.form.stock/gambas/128/office-draw.png b/comp/src/gb.form.stock/gambas/128/office-draw.png
new file mode 100644
index 000000000..94b5d059d
Binary files /dev/null and b/comp/src/gb.form.stock/gambas/128/office-draw.png differ
diff --git a/comp/src/gb.form.stock/gambas/128/office-presentation.png b/comp/src/gb.form.stock/gambas/128/office-presentation.png
new file mode 100644
index 000000000..bc5370a25
Binary files /dev/null and b/comp/src/gb.form.stock/gambas/128/office-presentation.png differ
diff --git a/comp/src/gb.form.stock/gambas/128/office.png b/comp/src/gb.form.stock/gambas/128/office.png
index 4ce581567..e5ce85fea 100644
Binary files a/comp/src/gb.form.stock/gambas/128/office.png and b/comp/src/gb.form.stock/gambas/128/office.png differ
diff --git a/comp/src/gb.form.stock/gambas/128/plugin.png b/comp/src/gb.form.stock/gambas/128/plugin.png
index 066da0d5c..9c59f65f9 100644
Binary files a/comp/src/gb.form.stock/gambas/128/plugin.png and b/comp/src/gb.form.stock/gambas/128/plugin.png differ
diff --git a/comp/src/gb.form.stock/gambas/128/sun.png b/comp/src/gb.form.stock/gambas/128/sun.png
index 571c13c2b..dabfda2cc 100644
Binary files a/comp/src/gb.form.stock/gambas/128/sun.png and b/comp/src/gb.form.stock/gambas/128/sun.png differ
diff --git a/comp/src/gb.form.stock/gambas/128/unlock.png b/comp/src/gb.form.stock/gambas/128/unlock.png
index 76cf2c4d9..9d6f8cdea 100644
Binary files a/comp/src/gb.form.stock/gambas/128/unlock.png and b/comp/src/gb.form.stock/gambas/128/unlock.png differ
diff --git a/comp/src/gb.form.stock/gambas/128/warning.png b/comp/src/gb.form.stock/gambas/128/warning.png
index f190d0d98..ed1f4498d 100644
Binary files a/comp/src/gb.form.stock/gambas/128/warning.png and b/comp/src/gb.form.stock/gambas/128/warning.png differ
diff --git a/comp/src/gb.form.stock/gambas/128/wizard.png b/comp/src/gb.form.stock/gambas/128/wizard.png
index 3a78ef1a4..cb94a427b 100644
Binary files a/comp/src/gb.form.stock/gambas/128/wizard.png and b/comp/src/gb.form.stock/gambas/128/wizard.png differ
diff --git a/comp/src/gb.form.stock/gambas/32/component.png b/comp/src/gb.form.stock/gambas/32/component.png
index 015a8bff6..f049ac984 100644
Binary files a/comp/src/gb.form.stock/gambas/32/component.png and b/comp/src/gb.form.stock/gambas/32/component.png differ
diff --git a/comp/src/gb.form.stock/gambas/32/group.png b/comp/src/gb.form.stock/gambas/32/group.png
index 59634eea2..e2170d3a4 100644
Binary files a/comp/src/gb.form.stock/gambas/32/group.png and b/comp/src/gb.form.stock/gambas/32/group.png differ
diff --git a/comp/src/gb.form.stock/gambas/32/office-draw.png b/comp/src/gb.form.stock/gambas/32/office-draw.png
index ed44c30d3..a451ca92d 100644
Binary files a/comp/src/gb.form.stock/gambas/32/office-draw.png and b/comp/src/gb.form.stock/gambas/32/office-draw.png differ
diff --git a/comp/src/gb.form.stock/gambas/32/office-presentation.png b/comp/src/gb.form.stock/gambas/32/office-presentation.png
new file mode 100644
index 000000000..a5e590c53
Binary files /dev/null and b/comp/src/gb.form.stock/gambas/32/office-presentation.png differ
diff --git a/comp/src/gb.form.stock/gambas/32/office.png b/comp/src/gb.form.stock/gambas/32/office.png
index 18d0bcaf7..73ab6257f 100644
Binary files a/comp/src/gb.form.stock/gambas/32/office.png and b/comp/src/gb.form.stock/gambas/32/office.png differ
diff --git a/comp/src/gb.form.stock/gambas/32/plugin.png b/comp/src/gb.form.stock/gambas/32/plugin.png
index d073d9c43..6f57e27e4 100644
Binary files a/comp/src/gb.form.stock/gambas/32/plugin.png and b/comp/src/gb.form.stock/gambas/32/plugin.png differ
diff --git a/comp/src/gb.form.stock/gambas/32/warning.png b/comp/src/gb.form.stock/gambas/32/warning.png
index 2b70ddc6e..39174e6e3 100644
Binary files a/comp/src/gb.form.stock/gambas/32/warning.png and b/comp/src/gb.form.stock/gambas/32/warning.png differ
diff --git a/comp/src/gb.form.stock/links b/comp/src/gb.form.stock/links
index 8fd3ab105..3c4f64d31 100644
--- a/comp/src/gb.form.stock/links
+++ b/comp/src/gb.form.stock/links
@@ -4,7 +4,12 @@ application-pdf -> pdf
 application-vnd.debian.binary-package -> package
 application-vnd.google-earth.kml+xml -> html
 application-vnd.ms-excel -> office-calc
+application-vns.ms-powerpoint -> office-presentation
+application-vnd.ms-word -> office
 application-vnd.oasis.opendocument.graphics -> office-draw
+application-vnd.oasis.opendocument.presentation -> office-presentation
+application-vnd.oasis.opendocument.spreadsheet -> office-calc
+application-vnd.oasis.opendocument.text -> office
 application-vnd.stardivision.calc -> office-calc
 application-vnd.stardivision.writer -> office
 application-vnd.sun.xml.calc -> office-calc
diff --git a/comp/src/gb.form/map/icon.map b/comp/src/gb.form/map/icon.map
index f3bc2a8d9..251af0f92 100644
--- a/comp/src/gb.form/map/icon.map
+++ b/comp/src/gb.form/map/icon.map
@@ -150,7 +150,10 @@ new-tab                 actions/tab-new
 new-tag                 actions/tag-new
 new-window              actions/window-new
 next                    actions/go-next;actions/go-next-view
-office                  [elementary]categories/applications-other;categories/applications-office
+office                  $(mime)/x-office-document
+office-calc             $(mime)/x-office-spreadsheet
+office-draw             $(mime)/x-office-drawing
+office-presentation     [elementary]$(mime)/application-vns.ms-powerpoint;$(mime)/x-office-presentation
 ok                      actions/dialog-ok
 opacity                 [breeze]actions/edit-opacity
 open                    actions/document-open