diff --git a/settings/migrations/0002_auto_20180301_1047.py b/settings/migrations/0002_auto_20180301_1047.py
new file mode 100644
index 0000000..fbfe96d
--- /dev/null
+++ b/settings/migrations/0002_auto_20180301_1047.py
@@ -0,0 +1,28 @@
+# Generated by Django 2.0.1 on 2018-03-01 10:47
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('settings', '0001_initial'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='sitesettings',
+            name='event_poster',
+            field=models.ImageField(null=True, upload_to='', verbose_name="Affiche de l'événement"),
+        ),
+        migrations.AddField(
+            model_name='sitesettings',
+            name='min_number_of_categories',
+            field=models.PositiveIntegerField(default=0, verbose_name='Nombre minimal de catégories dans laquelle participer'),
+        ),
+        migrations.AddField(
+            model_name='sitesettings',
+            name='site_logo',
+            field=models.ImageField(null=True, upload_to='', verbose_name='Logo du site'),
+        ),
+    ]
diff --git a/settings/models.py b/settings/models.py
index 73ec1cd..b0dc471 100644
--- a/settings/models.py
+++ b/settings/models.py
@@ -13,6 +13,18 @@ class SiteSettings(models.Model):
         verbose_name="Message de la page d'accueil",
         default=""
     )
+    site_logo = models.ImageField(
+        verbose_name="Logo du site",
+        null=True
+    )
+    event_poster = models.ImageField(
+        verbose_name="Affiche de l'événement",
+        null=True
+    )
+    min_number_of_categories = models.PositiveIntegerField(
+        verbose_name="Nombre minimal de catégories dans laquelle participer",
+        default=0,
+    )
 
     @classmethod
     def get_settings(cls):
diff --git a/settings/templates/settings/settings.html b/settings/templates/settings/settings.html
index d09b3a1..8114371 100644
--- a/settings/templates/settings/settings.html
+++ b/settings/templates/settings/settings.html
@@ -82,5 +82,29 @@
         <th>Message d'accueil</th>
         <td>{{site_settings.home_message}}</td>
     </tr>
+    <tr>
+        <th>Logo du site</th>
+        <td>
+            {% if site_settings.site_logo %}
+            <img src="{{ site_settings.site_logo.url }}" alt="logo"/>
+            {% else %}
+            Pas de logo
+            {% endif %}
+        </td>
+    </tr>
+    <tr>
+        <th>Affiche de l'événement</th>
+        <td>
+            {% if site_settings.event_poster %}
+            <img src="{{ site_settings.event_poster.url }}" alt="affiche"/>
+            {% else %}
+            Pas d'affiche
+            {% endif %}
+        </td>
+    </tr>
+    <tr>
+        <th>Nombre minimal de catégories</th>
+        <td>{{ site_settings.min_number_of_categories }}</td>
+    </tr>
 </table>
 {% endblock %}
diff --git a/site_tps/views.py b/site_tps/views.py
index a90820c..97f50ac 100644
--- a/site_tps/views.py
+++ b/site_tps/views.py
@@ -7,4 +7,5 @@ def home(request):
     return render(request, "home.html", {
         'upload_allowed': settings.allow_upload,
         'message': settings.home_message,
+        'poster': settings.event_poster,
     })
diff --git a/templates/nav_bar.html b/templates/nav_bar.html
index 01edf3e..28560bb 100644
--- a/templates/nav_bar.html
+++ b/templates/nav_bar.html
@@ -1,7 +1,15 @@
 {% load categories %}
+{% load load_settings %}
 {% load_categories %}
+{% load_site_settings %}
 <nav class="navbar navbar-expand-lg navbar-light bg-light">
-    <a class="navbar-brand" href="{% url "home"%}">Il était une fois dans l'est</a>
+    <a class="navbar-brand" href="{% url "home"%}">
+        {% if site_settings.site_logo %}
+        <img src="{{ site_settings.site_logo.url}}"/>
+        {% else %}
+        Il était une fois dans l'est
+        {% endif %}
+    </a>
     <button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbarText" aria-controls="navbarText" aria-expanded="false" aria-label="Toggle navigation">
     <span class="navbar-toggler-icon"></span>
     </button>