diff --git a/ext/custom-addons/cam_custom/static/src/img/favicon.ico b/ext/custom-addons/cam_custom/static/src/img/favicon.ico
index 4abb4092..98f62754 100644
Binary files a/ext/custom-addons/cam_custom/static/src/img/favicon.ico and b/ext/custom-addons/cam_custom/static/src/img/favicon.ico differ
diff --git a/ext/custom-addons/cam_custom/static/src/img/logo.png b/ext/custom-addons/cam_custom/static/src/img/logo.png
new file mode 100644
index 00000000..eab51af1
Binary files /dev/null and b/ext/custom-addons/cam_custom/static/src/img/logo.png differ
diff --git a/setup/lib/cli.py b/setup/lib/cli.py
index 03e7a21d..dba70ba9 100755
--- a/setup/lib/cli.py
+++ b/setup/lib/cli.py
@@ -71,6 +71,7 @@ def main():
             'set_dokumentennummern',
             'set_dmi_noupdate',
             'dmi_confirm_inventory',
+            'setup_mail_server',
         ]
 
     if cmd == 'update':
diff --git a/setup/lib/config_at.py b/setup/lib/config_at.py
index e4eb7288..9bb8f1d2 100644
--- a/setup/lib/config_at.py
+++ b/setup/lib/config_at.py
@@ -28,8 +28,17 @@ class Config():
             'rml_header1': False,
             'vat_check_vies': True,
             'tax_calculation_rounding_method': 'round_globally',
-            #'rml_header' : './ext/addons/custom_reports/report/page.rml', # Report File
-            'logo': '../ext/custom-addons/cam_reports/logo.png',
+            'logo': '../ext/custom-addons/cam_custom/static/src/img/logo.png',
+        }
+
+        self.mail_server = {
+            'name': 'test',
+            'sequence': 0,
+            'smtp_host': 'smtp.1und1.de',
+            'smtp_port': '465',
+            'smtp_encryption': 'ssl',
+            'smtp_user': 'test',
+            'smtp_pass': 'test',
         }
         
         # Nur für Lager
diff --git a/setup/lib/functions.py b/setup/lib/functions.py
index 1e92159c..c52a1fa8 100755
--- a/setup/lib/functions.py
+++ b/setup/lib/functions.py
@@ -522,3 +522,16 @@ class CamadeusFunctions():
             return False
         
         return True    
+
+    def setup_mail_server(self):
+        """Mailserver einrichten"""
+        
+        if hasattr(self.config, 'mail_server'):
+            vals = self.config.mail_server
+            server_ids = self._execute('ir.mail_server', 'search', [('name','=',vals.get('name'))])
+            
+            if server_ids:
+                return self._execute('ir.mail_server', 'write', server_ids, vals)
+            else:
+                return self._execute('ir.mail_server', 'create', vals)
+        return False
\ No newline at end of file