diff --git a/dev_git_project_task_connector/__manifest__.py b/dev_git_project_task_connector/__manifest__.py
index 1030a98..1fa850f 100644
--- a/dev_git_project_task_connector/__manifest__.py
+++ b/dev_git_project_task_connector/__manifest__.py
@@ -3,7 +3,7 @@
 
 {
     "name": "Git Project Task Connector",
-    "version": "12.0.1.0.0",
+    "version": "12.0.1.1.0",
     "author": "Elabore",
     "maintainer": "False",
     "website": "False",
@@ -74,6 +74,7 @@ This module is maintained by ELABORE.
         "views/project_task.xml",
         "views/git_issue.xml",
         "views/git_repository.xml",
+        "views/res_config_settings_view.xml",
         "views/menus.xml",
         "data/git_issue_data.xml",
     ],
diff --git a/dev_git_project_task_connector/static/description/icon.png b/dev_git_project_task_connector/static/description/icon.png
new file mode 100644
index 0000000..12538fa
Binary files /dev/null and b/dev_git_project_task_connector/static/description/icon.png differ
diff --git a/dev_git_project_task_connector/views/res_config_settings_view.xml b/dev_git_project_task_connector/views/res_config_settings_view.xml
new file mode 100644
index 0000000..e9a7996
--- /dev/null
+++ b/dev_git_project_task_connector/views/res_config_settings_view.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo>
+    <record id="res_config_settings_view_form_git" model="ir.ui.view">
+        <field name="name">res.config.settings.view.form.inherit.git</field>
+        <field name="model">res.config.settings</field>
+        <field name="priority" eval="99" />
+        <field name="inherit_id" ref="base.res_config_settings_view_form" />
+        <field name="arch" type="xml">
+            <xpath expr="//div[hasclass('settings')]" position="inside">
+                <div class="app_settings_block" data-string="git" string="Git" data-key="dev_git_project_task_connector">
+                    <h2>Git generic configuration</h2>
+                    <div class="row mt16 o_settings_container" id="git_generic_settings">
+                        <p>No generic configuration</p>
+                    </div>
+                </div>
+            </xpath>
+        </field>
+    </record>
+</odoo>
\ No newline at end of file
diff --git a/dev_github_connector/__manifest__.py b/dev_github_connector/__manifest__.py
index bae9831..4d82e04 100644
--- a/dev_github_connector/__manifest__.py
+++ b/dev_github_connector/__manifest__.py
@@ -3,7 +3,7 @@
 
 {
     "name": "Github Odoo Connector",
-    "version": "12.0.1.0.0",
+    "version": "12.0.1.2.0",
     "author": "Elabore",
     "maintainer": "False",
     "website": "False",
@@ -65,7 +65,7 @@ This module is maintained by ELABORE.
     },
     # always loaded
     "data": [
-        "views/res_user.xml",
+        "views/res_config_settings_view.xml",
         "data/git_platform.xml",
     ],
     # only loaded in demonstration mode
diff --git a/dev_github_connector/models/__init__.py b/dev_github_connector/models/__init__.py
index 8038eae..dc6ef40 100644
--- a/dev_github_connector/models/__init__.py
+++ b/dev_github_connector/models/__init__.py
@@ -1,5 +1,6 @@
 # -*- coding: utf-8 -*-
 
-from . import res_user
+from . import res_config_settings
+from . import company
 from . import git_platform
 from . import git_issue
diff --git a/dev_github_connector/models/res_user.py b/dev_github_connector/models/company.py
similarity index 52%
rename from dev_github_connector/models/res_user.py
rename to dev_github_connector/models/company.py
index 3ea2763..1d69bc3 100644
--- a/dev_github_connector/models/res_user.py
+++ b/dev_github_connector/models/company.py
@@ -1,9 +1,7 @@
-# -*- coding: utf-8 -*-
-
 from odoo import models, fields
 
 
-class Users(models.Model):
-    _inherit = "res.users"
+class Company(models.Model):
+    _inherit = "res.company"
 
     github_token = fields.Char(string="Github token")
diff --git a/dev_github_connector/models/res_config_settings.py b/dev_github_connector/models/res_config_settings.py
new file mode 100644
index 0000000..e465201
--- /dev/null
+++ b/dev_github_connector/models/res_config_settings.py
@@ -0,0 +1,9 @@
+from odoo import fields, models
+
+
+class ResConfigSettings(models.TransientModel):
+    _inherit = "res.config.settings"
+
+    github_token = fields.Char(
+        related="company_id.github_token", string="Github token", readonly=False
+    )
diff --git a/dev_github_connector/views/res_config_settings_view.xml b/dev_github_connector/views/res_config_settings_view.xml
new file mode 100644
index 0000000..e8ac109
--- /dev/null
+++ b/dev_github_connector/views/res_config_settings_view.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo>
+    <record id="res_config_settings_view_form_github" model="ir.ui.view">
+        <field name="name">res.config.settings.view.form.inherit.github</field>
+        <field name="model">res.config.settings</field>
+        <field name="priority" eval="99" />
+        <field name="inherit_id" ref="dev_git_project_task_connector.res_config_settings_view_form_git" />
+        <field name="arch" type="xml">
+            <xpath expr="//div[@id='git_generic_settings']" position="after">
+                <h2>Github configuration</h2>
+                <div class="row mt16 o_settings_container" id="github_settings">
+                    <div class="col-12 col-lg-6 o_setting_box" id="github_tokenl">
+                        <div class="o_setting_left_pane" />
+                        <div class="o_setting_right_pane">
+                            <span class="o_form_label">Github token</span>
+                            <div class="text-muted">
+                                <field name="github_token" widget="password" />
+                            </div>
+                        </div>
+                    </div>
+                </div>
+            </xpath>
+        </field>
+    </record>
+</odoo>
\ No newline at end of file
diff --git a/dev_github_connector/views/res_user.xml b/dev_github_connector/views/res_user.xml
deleted file mode 100644
index 2376d5f..0000000
--- a/dev_github_connector/views/res_user.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<odoo>
-    <data>
-        <record id="view_users_form_simple_gitub_token" model="ir.ui.view">
-            <field name="name">res.users.github.preferences.form</field>
-            <field name="model">res.users</field>
-            <field name="inherit_id" ref="base.view_users_form_simple_modif" />
-            <field name="arch" type="xml">
-                <xpath expr="//group[@name='preferences']" position="after">
-                    <group string="Github credentials">
-                        <field name="github_token" readonly="0" />
-                    </group>
-                </xpath>
-            </field>
-        </record>
-    </data>
-</odoo>
\ No newline at end of file
diff --git a/dev_github_connector/wizard/create_issue.py b/dev_github_connector/wizard/create_issue.py
index 9b29467..70cf4d4 100644
--- a/dev_github_connector/wizard/create_issue.py
+++ b/dev_github_connector/wizard/create_issue.py
@@ -18,7 +18,7 @@ class CreateGitIssue(models.TransientModel):
     def _create_git_issue(self):
         values = super(CreateGitIssue, self)._create_git_issue()
         if self.issue_platform.tool == "github":
-            github = Github(self.env.user.github_token)
+            github = Github(self.env.user.company_id.github_token)
             repo = github.get_repo(self.issue_repo.displayed_name)
             issue = repo.create_issue(
                 title=self.issue_name, body=self.issue_description