diff --git a/app/Migrations/Schema/V200/Version20.php b/app/Migrations/Schema/V200/Version20.php
index b56a00f161..bf6f89c934 100644
--- a/app/Migrations/Schema/V200/Version20.php
+++ b/app/Migrations/Schema/V200/Version20.php
@@ -639,6 +639,7 @@ class Version20 extends AbstractMigrationChamilo
         $this->addSql('CREATE UNIQUE INDEX UNIQ_C9FA0CBD1BAD783F ON c_document (resource_node_id)');
 
         $this->addSql('ALTER TABLE c_document CHANGE session_id session_id INT DEFAULT NULL;');
+        $this->addSql('UPDATE c_document SET session_id = null WHERE session_id = 0');
         $this->addSql('ALTER TABLE c_document ADD CONSTRAINT FK_C9FA0CBD613FECDF FOREIGN KEY (session_id) REFERENCES session (id)');
         $this->addSql('CREATE INDEX IDX_C9FA0CBD613FECDF ON c_document (session_id)');
 
diff --git a/main/inc/global_error_message.inc.php b/main/inc/global_error_message.inc.php
index 345409b404..4bda6ee1a0 100755
--- a/main/inc/global_error_message.inc.php
+++ b/main/inc/global_error_message.inc.php
@@ -58,14 +58,14 @@ if (is_int($global_error_code) && $global_error_code > 0) {
     $root_rel = '';
     $installation_guide_url = $root_rel.'documentation/installation_guide.html';
     $css_list = [
-        'public/build/chamilo.css',
+        'public/build/vendor.css',
+        'public/build/css/app.css',
         'public/build/css/base.css',
         'public/build/css/themes/'.$theme.'/default.css',
     ];
 
     $web_img = 'main/img';
     $root_sys = str_replace('\\', '/', realpath(__DIR__.'/../../')).'/';
-
     $css_def = '';
     foreach ($css_list as $cssFile) {
         $cssFile = $root_sys.$cssFile;
@@ -272,35 +272,27 @@ EOM;
                     </div>
                 </header>
                 <section id="menu-bar">
-                <nav class="navbar navbar-default">
-                    <div class="container">        
-                    <div class="navbar-header">
-                        <button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target="#menuone" aria-expanded="false">
-                            <span class="sr-only">Toggle navigation</span>
-                            <span class="icon-bar"></span>
-                            <span class="icon-bar"></span>
-                            <span class="icon-bar"></span>
-                        </button>
-                    </div>  
-                    <div class="collapse navbar-collapse" id="menuone">
-                        <ul class="nav navbar-nav">
-                            <li id="current" class="active tab-homepage"><a href="#" target="_self">Homepage</a></li>
+                <nav class="navbar navbar-expand-lg navbar-dark bg-primary">
+                    <div class="container">
+                        <div class="collapse navbar-collapse" id="navbarSupportedContent">
+                        <ul class="navbar-nav mr-auto">
+                          <li class="nav-item active">
+                            <a class="nav-link" href="#">Home <span class="sr-only"></span></a>
+                          </li>
                         </ul>
-                    </div>
+                        </div>
                     </div>
                 </nav>
                 </section>
                 
                 <section id="content-error">
                     <div class="container">
-                        <div class="panel panel-default">
-                        <div class="panel-body">
+                        <div class="well">                        
                             <div class="alert alert-danger" role="alert">
                                 {DESCRIPTION}
                                 {CODE}
                             </div>
                         </div>
-                        </div>
                     </div>
                 </section>
             </div>
diff --git a/main/install/index.php b/main/install/index.php
index 0e4bf03150..497ce1d935 100755
--- a/main/install/index.php
+++ b/main/install/index.php
@@ -353,7 +353,7 @@ if ($encryptPassForm == '1') {
             });
 
             $("#button_please_wait").hide();
-            $("button").addClass('btn btn-default');
+            $("button").addClass('btn btn-secondary');
 
             // Allow Chamilo install in IE
             $("button").click(function() {
@@ -702,7 +702,7 @@ if (@$_POST['step2']) {
     <table width="100%">
         <tr>
             <td>
-                <button type="submit" class="btn btn-default" name="step4" value="&lt; <?php echo get_lang('Previous'); ?>" >
+                <button type="submit" class="btn btn-secondary" name="step4" value="&lt; <?php echo get_lang('Previous'); ?>" >
                     <em class="fa fa-backward"> </em> <?php echo get_lang('Previous'); ?>
                 </button>
             </td>
diff --git a/main/install/install.lib.php b/main/install/install.lib.php
index c88a5ea143..57b95e1332 100755
--- a/main/install/install.lib.php
+++ b/main/install/install.lib.php
@@ -597,7 +597,7 @@ function get_config_param_from_db($param = '')
  * @param string $dbNameForm     DB name
  * @param int    $dbPortForm     DB port
  *
- * @return Database
+ * @return \Database
  */
 function connectToDatabase(
     $dbHostForm,
@@ -1063,13 +1063,15 @@ function display_requirements(
                         <input type="text" name="updatePath" size="50" value="<?php echo ($badUpdatePath && !empty($updatePath)) ? htmlentities($updatePath) : ''; ?>" />
                     </p>
                     <p>
-                        <button type="submit" class="btn btn-default" name="step1" value="<?php echo get_lang('Back'); ?>" >
-                            <em class="fa fa-backward"> <?php echo get_lang('Back'); ?></em>
-                        </button>
-                        <input type="hidden" name="is_executable" id="is_executable" value="-" />
-                        <button type="submit" class="btn btn-success" name="<?php echo isset($_POST['step2_update_6']) ? 'step2_update_6' : 'step2_update_8'; ?>" value="<?php echo get_lang('Next'); ?> &gt;" >
-                            <em class="fa fa-forward"> </em> <?php echo get_lang('Next'); ?>
-                        </button>
+                        <div class="btn-group">
+                            <button type="submit" class="btn btn-secondary" name="step1" value="<?php echo get_lang('Back'); ?>" >
+                                <em class="fa fa-backward"> <?php echo get_lang('Back'); ?></em>
+                            </button>
+                            <input type="hidden" name="is_executable" id="is_executable" value="-" />
+                            <button type="submit" class="btn btn-success" name="<?php echo isset($_POST['step2_update_6']) ? 'step2_update_6' : 'step2_update_8'; ?>" value="<?php echo get_lang('Next'); ?> &gt;" >
+                                <em class="fa fa-forward"> </em> <?php echo get_lang('Next'); ?>
+                            </button>
+                        </div>
                     </p>
                 </div>
             </div>
@@ -1167,14 +1169,14 @@ function display_requirements(
 
         // And now display the choice buttons (go back or install)?>
         <p align="center" style="padding-top:15px">
-        <button type="submit" name="step1" class="btn btn-default" onclick="javascript: window.location='index.php'; return false;" value="<?php echo get_lang('Previous'); ?>" >
-            <em class="fa fa-backward"> </em> <?php echo get_lang('Previous'); ?>
-        </button>
-        <button type="submit" name="step2_install" class="btn btn-success" value="<?php echo get_lang("NewInstallation"); ?>" <?php if ($error) {
-            echo 'disabled="disabled"';
-        } ?> >
-            <em class="fa fa-forward"> </em> <?php echo get_lang('NewInstallation'); ?>
-        </button>
+            <button type="submit" name="step1" class="btn btn-default" onclick="javascript: window.location='index.php'; return false;" value="<?php echo get_lang('Previous'); ?>" >
+                <em class="fa fa-backward"> </em> <?php echo get_lang('Previous'); ?>
+            </button>
+            <button type="submit" name="step2_install" class="btn btn-success" value="<?php echo get_lang("NewInstallation"); ?>" <?php if ($error) {
+                echo 'disabled="disabled"';
+            } ?> >
+                <em class="fa fa-forward"> </em> <?php echo get_lang('NewInstallation'); ?>
+            </button>
         <input type="hidden" name="is_executable" id="is_executable" value="-" />
             <button type="submit" class="btn btn-default" <?php echo !$error ?: 'disabled="disabled"'; ?> name="step2_update_8" value="Upgrade from Chamilo 1.9.x">
                 <em class="fa fa-forward" aria-hidden="true"></em> <?php echo get_lang('UpgradeVersion'); ?>
@@ -1533,19 +1535,51 @@ function display_database_settings_form(
         $database_exists_text = '';
     $manager = null;
     try {
-        $manager = connectToDatabase(
+        if ($installType === 'update') {
+            /** @var \Database $manager */
+            $manager = connectToDatabase(
+                $dbHostForm,
+                $dbUsernameForm,
+                $dbPassForm,
+                $dbNameForm,
+                $dbPortForm
+            );
+
+            $connection = $manager->getConnection();
+            $connection->connect();
+            $schemaManager = $connection->getSchemaManager();
+
+            // Test create/alter/drop table
+            $table = 'zXxTESTxX_'.mt_rand(0, 1000);
+            $sql = "CREATE TABLE $table (id INT AUTO_INCREMENT NOT NULL, name varchar(255), PRIMARY KEY(id))";
+            $connection->query($sql);
+            $tableCreationWorks = false;
+            $tableDropWorks = false;
+            if ($schemaManager->tablesExist($table)) {
+                $tableCreationWorks = true;
+                $sql = "ALTER TABLE $table ADD COLUMN name2 varchar(140) ";
+                $connection->query($sql);
+                $schemaManager->dropTable($table);
+                $tableDropWorks = $schemaManager->tablesExist($table) === false;
+            }
+        } else {
+            $schemaManager = $manager->getConnection()->getSchemaManager();
+            $databases = $schemaManager->listDatabases();
+            if (in_array($dbNameForm, $databases)) {
+                $database_exists_text = '<div class="alert alert-warning">'.get_lang('ADatabaseWithTheSameNameAlreadyExists').'</div>';
+            }
+
+            $manager = connectToDatabase(
                 $dbHostForm,
                 $dbUsernameForm,
                 $dbPassForm,
                 null,
                 $dbPortForm
             );
-        $databases = $manager->getConnection()->getSchemaManager()->listDatabases();
-        if (in_array($dbNameForm, $databases)) {
-            $database_exists_text = '<div class="alert alert-warning">'.get_lang('ADatabaseWithTheSameNameAlreadyExists').'</div>';
         }
     } catch (Exception $e) {
         $database_exists_text = $e->getMessage();
+        $manager = false;
     }
 
     if ($manager && $manager->getConnection()->isConnected()): ?>
@@ -1554,6 +1588,15 @@ function display_database_settings_form(
             Database host: <strong><?php echo $manager->getConnection()->getHost(); ?></strong><br/>
             Database port: <strong><?php echo $manager->getConnection()->getPort(); ?></strong><br/>
             Database driver: <strong><?php echo $manager->getConnection()->getDriver()->getName(); ?></strong><br/>
+            <?php
+                if ($installType === 'update') {
+                    echo get_lang('CreateTableWorks').' <strong>Ok</strong>';
+                    echo '<br/ >';
+                    echo get_lang('AlterTableWorks').' <strong>Ok</strong>';
+                    echo '<br/ >';
+                    echo get_lang('DropColumnWorks').' <strong>Ok</strong>';
+                }
+            ?>
         </div>
     <?php else: ?>
         <div id="db_status" class="alert alert-danger">
@@ -3578,7 +3621,7 @@ function migrateSwitch($fromVersion, $manager, $processFiles = true)
 {
     error_log('Starting migration process from '.$fromVersion.' ('.date('Y-m-d H:i:s').')');
 
-    echo '<a class="btn btn-default" href="javascript:void(0)" id="details_button">'.get_lang('Details').'</a><br />';
+    echo '<a class="btn btn-secondary" href="javascript:void(0)" id="details_button">'.get_lang('Details').'</a><br />';
     echo '<div id="details" style="display:none">';
 
     $connection = $manager->getConnection();