diff --git a/app/Controller/UsersController.php b/app/Controller/UsersController.php
index b31275758a..6a80f9b203 100644
--- a/app/Controller/UsersController.php
+++ b/app/Controller/UsersController.php
@@ -1349,9 +1349,6 @@ public function logout()
         if ($this->Session->check('Auth.User')) {
             $this->User->extralog($this->Auth->user(), "logout");
         }
-        if (!Configure::read('Plugin.CustomAuth_custom_logout')) {
-            $this->Flash->info(__('Good-Bye'));
-        }
         $user = $this->User->find('first', array(
             'conditions' => array(
                 'User.id' => $this->Auth->user('id')
diff --git a/app/View/Elements/global_menu.ctp b/app/View/Elements/global_menu.ctp
index 3dcd82cbb4..261897dfc9 100755
--- a/app/View/Elements/global_menu.ctp
+++ b/app/View/Elements/global_menu.ctp
@@ -513,7 +513,7 @@
             array(
                 'type' => 'root',
                 'url' => empty($homepage['path']) ? $baseurl : $baseurl . h($homepage['path']),
-                'html' => '<span class="logoBlueStatic bold" id="smallLogo">MISP</span>'
+                'html' => '<span class="logoBlueStatic bold" id="smallLogo">DTIP</span>'
             ),
             [
                 'type' => 'root',
diff --git a/app/View/Layouts/default.ctp b/app/View/Layouts/default.ctp
index 886b1cff2d..717f1a59df 100644
--- a/app/View/Layouts/default.ctp
+++ b/app/View/Layouts/default.ctp
@@ -46,7 +46,7 @@
     <div id="container">
         <?php
             echo $this->element('global_menu');
-            $topPadding = '50';
+            $topPadding = '40';
             if (!empty($debugMode) && $debugMode != 'debugOff') {
                 $topPadding = '0';
             }
@@ -77,7 +77,6 @@
             'keyboard-shortcuts',
         ],
     ]);
-    echo $this->element('footer');
     echo $this->element('sql_dump');
     ?>
     <div id="ajax_success_container" class="ajax_container">
diff --git a/app/View/Users/login.ctp b/app/View/Users/login.ctp
index b8433df972..ab44e2eaac 100644
--- a/app/View/Users/login.ctp
+++ b/app/View/Users/login.ctp
@@ -1,25 +1,18 @@
-<div style="width:100%;">
+<div style="width:100%; background-image: url(<?php echo $baseurl?>/img/DTIP-Background.png); background-color: #E4E4E4; background-position: bottom; position: absolute; bottom: 0;  background-repeat: no-repeat;  min-height: 100% !important; background-size: contain;">
     <?php
         echo $this->Session->flash('auth');
     ?>
 <table style="margin-left:auto;margin-right:auto;">
     <tr>
-    <td style="text-align:right;width:250px;padding-right:50px">
+    <td style="text-align:right;width:250px;padding-right:50px;">
         <?php if (Configure::read('MISP.welcome_logo')) echo $this->Html->image('custom/' . h(Configure::read('MISP.welcome_logo')), array('alt' => __('Logo'), 'onerror' => "this.style.display='none';")); ?>
     </td>
-    <td style="width:460px">
-        <span style="font-size:18px;">
-            <?php
-                if (Configure::read('MISP.welcome_text_top')) {
-                    echo h(Configure::read('MISP.welcome_text_top'));
-                }
-            ?>
-        </span><br /><br />
-        <div>
+    <td style="width:460px;">
+        <div style="margin-top: 50px;">
         <?php if (Configure::read('MISP.main_logo') && file_exists(APP . '/webroot/img/custom/' . Configure::read('MISP.main_logo'))): ?>
             <img src="<?php echo $baseurl?>/img/custom/<?php echo h(Configure::read('MISP.main_logo'));?>" style=" display:block; margin-left: auto; margin-right: auto;" />
         <?php else: ?>
-            <img src="<?php echo $baseurl?>/img/misp-logo-s-u.png" style="display:block; margin-left: auto; margin-right: auto;"/>
+            <img src="<?php echo $baseurl?>/img/DTIP-Logo.png" style="width: 150px; display:block; margin: 20px auto;"/>
         <?php endif;?>
         </div>
         <?php
@@ -35,10 +28,12 @@
             if ($formLoginEnabled):
             echo $this->Form->create('User');
         ?>
-        <legend><?php echo __('Login');?></legend>
+        <!-- <legend><?php echo __('Login');?></legend> -->
+        <div style="padding: 0 25%;">
+        <div style="display: flex; flex-direction: column;">
         <?php
-            echo $this->Form->input('email', array('autocomplete' => 'off', 'autofocus'));
-            echo $this->Form->input('password', array('autocomplete' => 'off'));
+            echo $this->Form->input('email', array('autocomplete' => 'off', 'autofocus', 'style' => 'margin-top:-5px'));
+            echo $this->Form->input('password', array('autocomplete' => 'off', 'style' => 'margin-top:-5px'));
             if (!empty(Configure::read('LinOTPAuth')) && Configure::read('LinOTPAuth.enabled')!== FALSE) {
                 echo $this->Form->input('otp', array('autocomplete' => 'off', 'type' => 'password', 'label' => 'OTP'));
                 echo "<div class=\"clear\">";
@@ -50,6 +45,7 @@
                 );
             }
         ?>
+        </div>
             <div class="clear">
             <?php
                 echo empty(Configure::read('Security.allow_self_registration')) ? '' : sprintf(
@@ -60,7 +56,10 @@
                 );
             ?>
             </div>
-            <?= $this->Form->button(__('Login'), array('class' => 'btn btn-primary')); ?>
+            <div style="padding-right: 8px;">
+                <?= $this->Form->button(__('Login'), array('class' => 'btn btn-primary btn-block')); ?>
+            </div>
+        </div>
         <?php
             echo $this->Form->end();
             endif;
diff --git a/app/View/Users/logout401.ctp b/app/View/Users/logout401.ctp
index 21b1fbab2c..362e3c7389 100644
--- a/app/View/Users/logout401.ctp
+++ b/app/View/Users/logout401.ctp
@@ -32,7 +32,7 @@
             <?php if (Configure::read('MISP.main_logo') && file_exists(APP . '/webroot/img/custom/' . Configure::read('MISP.main_logo'))): ?>
                 <img src="<?php echo $baseurl?>/img/custom/<?php echo h(Configure::read('MISP.main_logo'));?>" style=" display:block; margin-left: auto; margin-right: auto;" />
             <?php else: ?>
-                <img src="<?php echo $baseurl?>/img/misp-logo-s-u.png" style="display:block; margin-left: auto; margin-right: auto;"/>
+                <img src="<?php echo $baseurl?>/img/DTIP-Logo.png" style="display:block; margin-left: auto; margin-right: auto;"/>
             <?php endif;?>
             </div>
             <br>
diff --git a/app/webroot/img/DTIP-Background.png b/app/webroot/img/DTIP-Background.png
new file mode 100644
index 0000000000..4d213359e8
Binary files /dev/null and b/app/webroot/img/DTIP-Background.png differ
diff --git a/app/webroot/img/DTIP-Logo.png b/app/webroot/img/DTIP-Logo.png
new file mode 100644
index 0000000000..953c18783c
Binary files /dev/null and b/app/webroot/img/DTIP-Logo.png differ