diff --git a/src/DependencyInjection/Configuration.php b/src/DependencyInjection/Configuration.php
index 249b79e4..0dda8e13 100644
--- a/src/DependencyInjection/Configuration.php
+++ b/src/DependencyInjection/Configuration.php
@@ -326,6 +326,20 @@ class Configuration implements ConfigurationInterface
                         ->scalarNode('height')->defaultValue('200')->end()
                     ->end()
                 ->end()
+                ->arrayNode('branding')
+                    ->addDefaultsIfNotSet()
+                    ->children()
+                        ->scalarNode('logo')
+                            ->defaultNull()
+                        ->end()
+                        ->scalarNode('mini')
+                            ->defaultNull()
+                        ->end()
+                        ->scalarNode('company')
+                            ->defaultNull()
+                        ->end()
+                    ->end()
+                ->end()
             ->end()
         ;
 
diff --git a/templates/base.html.twig b/templates/base.html.twig
index 3419a726..82c47fcc 100644
--- a/templates/base.html.twig
+++ b/templates/base.html.twig
@@ -42,11 +42,19 @@
 {% block page_subtitle %}{% endblock %}
 
 {% block logo_mini %}
-    <b>K</b>TT
+    {% if not kimai_context.branding.mini is empty %}
+        {{ kimai_context.branding.mini|raw }}
+    {% else %}
+        <b>K</b>TT
+    {% endif %}
 {% endblock %}
 
 {% block logo_large %}
-    <b>Kimai</b> - Time Tracking
+    {% if not kimai_context.branding.company is empty %}
+        {{ kimai_context.branding.company|raw }}
+    {% else %}
+        <b>Kimai</b> - Time Tracking
+    {% endif %}
 {% endblock %}
 
 {% block footer %}
diff --git a/templates/partials/logo_login.html.twig b/templates/partials/logo_login.html.twig
index efff5158..69ce2a85 100644
--- a/templates/partials/logo_login.html.twig
+++ b/templates/partials/logo_login.html.twig
@@ -1 +1,7 @@
-{{- get_title('<b>', '</b><br>')|raw -}}
+{% if not kimai_context.branding.logo is empty %}
+    <img src="{{ kimai_context.branding.logo }}" style="max-width: 300px;">
+{% elseif not kimai_context.branding.company is empty %}
+    <b>{{ kimai_context.branding.company|raw }}</b>
+{% else %}
+    {{- get_title('<b>', '</b><br>')|raw -}}
+{% endif %}
diff --git a/tests/DependencyInjection/AppExtensionTest.php b/tests/DependencyInjection/AppExtensionTest.php
index cd212c63..7eb97d35 100644
--- a/tests/DependencyInjection/AppExtensionTest.php
+++ b/tests/DependencyInjection/AppExtensionTest.php
@@ -102,7 +102,12 @@ class AppExtensionTest extends TestCase
                     'border_color' => '#3b8bba',
                     'grid_color' => 'rgba(0,0,0,.05)',
                     'height' => '200'
-                ]
+                ],
+                'branding' => [
+                    'logo' => null,
+                    'mini' => null,
+                    'company' => null,
+                ],
             ],
             'kimai.theme.select_type' => null,
             'kimai.theme.show_about' => true,