diff --git a/library/Icinga/Web/Form/Decorator/Help.php b/library/Icinga/Web/Form/Decorator/Help.php
new file mode 100644
index 000000000..1f8df2ce0
--- /dev/null
+++ b/library/Icinga/Web/Form/Decorator/Help.php
@@ -0,0 +1,33 @@
+<?php
+// {{{ICINGA_LICENSE_HEADER}}}
+// {{{ICINGA_LICENSE_HEADER}}}
+
+namespace Icinga\Web\Form\Decorator;
+
+use Icinga\Application\Icinga;
+use Zend_Form_Decorator_Abstract;
+
+/**
+ * A decorator that will display the description as a help icon
+ */
+class Help extends Zend_Form_Decorator_Abstract
+{
+    /**
+     * Render a description and show it as a help icon
+     *
+     * @param  string $content
+     * @return string
+     */
+    public function render($content = '')
+    {
+        $element = $this->getElement();
+        $description = $element->getView()->escape($element->getDescription());
+
+        if (! empty($description)) {
+            $helpIcon = Icinga::app()->getViewRenderer()->view->icon('help', $description);
+            return $helpIcon . $content;
+        }
+
+        return  $content;
+    }
+}