diff --git a/ChangeLog b/ChangeLog
index 8adeb738a4..3ddb6b2bd9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -75,6 +75,7 @@ phpMyAdmin - ChangeLog
 - issue        Fix maxlength for User and Host on replication add user form
 - issue #15282 Fixed MySQL 8.0 password syntax error when creating a replication user
 - issue #15986 Fixed php fatal error "Uncaught TypeError: array_flip() expects parameter 1 to be array, null given"
+- issue        Fixed php fatal error "Uncaught TypeError: htmlspecialchars() expects parameter 1 to be string, int given"
 
 5.0.1 (2020-01-07)
 - issue #15719 Fixed error 500 when browsing a table when $cfg['LimitChars'] used a string and not an int value
diff --git a/js/error_report.js b/js/error_report.js
index 71b2255519..be37a42d1b 100644
--- a/js/error_report.js
+++ b/js/error_report.js
@@ -130,7 +130,7 @@ var ErrorReport = {
 
         var $buttons = $('<div class="floatright"></div>');
 
-        var buttonHtml  = '<button id="show_error_report">';
+        var buttonHtml  = '<button class="btn btn-primary" id="show_error_report">';
         buttonHtml += Messages.strShowReportDetails;
         buttonHtml += '</button>';
 
diff --git a/js/functions.js b/js/functions.js
index b68dcfd92c..16ab1714a1 100644
--- a/js/functions.js
+++ b/js/functions.js
@@ -4510,6 +4510,7 @@ Functions.createPrintAndBackButtons = function () {
     var backButton = $('<input>',{
         type: 'button',
         value: Messages.back,
+        class: 'btn btn-primary',
         id: 'back_button_print_view'
     });
     backButton.on('click', Functions.removePrintAndBackButton);
@@ -4517,6 +4518,7 @@ Functions.createPrintAndBackButtons = function () {
     var printButton = $('<input>',{
         type: 'button',
         value: Messages.print,
+        class: 'btn btn-primary',
         id: 'print_button_print_view'
     });
     printButton.on('click', Functions.printPage);
diff --git a/templates/view_create.twig b/templates/view_create.twig
index 299ee1c8ab..20e9370c51 100644
--- a/templates/view_create.twig
+++ b/templates/view_create.twig
@@ -113,7 +113,7 @@
 
     {% if ajax_dialog == false %}
         <input type="hidden" name="ajax_dialog" value="1" />
-        <input type="submit" name="" value="{% trans 'Go' %}" />
+        <input type="submit" class="btn btn-primary" name="" value="{% trans 'Go' %}" />
     {% endif %}
 
     </form>