diff --git a/www/pages/content/ticket_edit.tpl b/www/pages/content/ticket_edit.tpl
index c571efc1..67118ba5 100644
--- a/www/pages/content/ticket_edit.tpl
+++ b/www/pages/content/ticket_edit.tpl
@@ -23,7 +23,7 @@
                                     <tr><td>{|Letzte Aktion|}:</td><td>[ZEIT]</td></tr>
                                     <tr><td>{|Von|}:</td><td>[MAILADRESSE] ([KUNDE])</td></tr>
                                     <tr><td>{|Projekt|}:</td><td><input type="text" name="projekt" id="projekt" value="[PROJEKT]" size="20"></td></tr>
-                                    <tr><td>{|Adresse|}:</td><td><input type="text" name="adresse" id="adresse" value="[ADRESSE]" size="20"></td></tr>
+                                    <tr><td>{|Adresse|}:</td><td><input type="text" name="adresse" id="adresse" value="[ADRESSE]" size="20"><a href="index.php?module=adresse&action=edit&id=[ADRESSE_ID]"><img src="./themes/new/images/forward.svg" border="0" style="top:6px; position:relative"></a></td></tr>
                                     <tr><td>{|Tags|}:</td><td><input type="text" name="tags" id="tags" value="[TAGS]" size="20"></td></tr>
                                 </table>
                             </fieldset> 
diff --git a/www/pages/ticket.php b/www/pages/ticket.php
index b36e42d9..1de9e941 100644
--- a/www/pages/ticket.php
+++ b/www/pages/ticket.php
@@ -53,7 +53,7 @@ class Ticket {
                 $defaultorder = 1;
                 $defaultorderdesc = 0;
 
-                $menu = "<table cellpadding=0 cellspacing=0><tr><td nowrap>" . "<a href=\"index.php?module=ticket&action=edit&id=%value%\"><img src=\"./themes/{$app->Conf->WFconf['defaulttheme']}/images/edit.png\" border=\"0\"></a>" . "</td></tr></table>";
+                $menu = "<table cellpadding=0 cellspacing=0><tr><td nowrap>" . "<a href=\"index.php?module=ticket&action=edit&id=%value%\"><img src=\"./themes/{$app->Conf->WFconf['defaulttheme']}/images/edit.svg\" border=\"0\"></a>" . "</td></tr></table>";
 
 
                 $timedifference = "if (
@@ -466,6 +466,10 @@ class Ticket {
        	$this->app->Tpl->Set('STATUSICON', $this->ticket_status_icon($ticket_from_db['status'])."&nbsp;");
         $this->app->YUI->AutoComplete("adresse","adresse");
         $this->app->Tpl->Set('ADRESSE', $this->app->erp->ReplaceAdresse(false,$ticket_from_db['adresse'],false)); // Convert ID to form display
+
+
+        $this->app->Tpl->Set('ADRESSE_ID',$ticket_from_db['adresse']);
+
         $this->app->YUI->AutoComplete("projekt","projektname",1);
         $this->app->YUI->AutoComplete("status","ticketstatus",1);
         $this->app->YUI->TagEditor('tags', array('width'=>370));