diff --git a/libraries/Template.php b/libraries/Template.php
index 363e63536c..a7e1e203e4 100644
--- a/libraries/Template.php
+++ b/libraries/Template.php
@@ -10,6 +10,7 @@ namespace PMA\libraries;
 use Twig_Environment;
 use Twig_Loader_Filesystem;
 use PMA\libraries\twig\I18nExtension;
+use PMA\libraries\twig\SanitizeExtension;
 use PMA\libraries\twig\UrlExtension;
 use PMA\libraries\twig\UtilExtension;
 
@@ -64,6 +65,7 @@ class Template
             'debug' => false,
         ));
         $this->twig->addExtension(new I18nExtension());
+        $this->twig->addExtension(new SanitizeExtension());
         $this->twig->addExtension(new UrlExtension());
         $this->twig->addExtension(new UtilExtension());
     }
diff --git a/libraries/twig/SanitizeExtension.php b/libraries/twig/SanitizeExtension.php
new file mode 100644
index 0000000000..277c14082c
--- /dev/null
+++ b/libraries/twig/SanitizeExtension.php
@@ -0,0 +1,35 @@
+<?php
+/* vim: set expandtab sw=4 ts=4 sts=4: */
+/**
+ * hold PMA\libraries\twig\SanitizeExtension class
+ *
+ * @package PMA\libraries\twig
+ */
+namespace PMA\libraries\twig;
+
+use Twig_Extension;
+use Twig_SimpleFunction;
+
+/**
+ * Class SanitizeExtension
+ *
+ * @package PMA\libraries\twig
+ */
+class SanitizeExtension extends Twig_Extension
+{
+    /**
+     * Returns a list of functions to add to the existing list.
+     *
+     * @return Twig_SimpleFunction[]
+     */
+    public function getFunctions()
+    {
+        return array(
+            new Twig_SimpleFunction(
+                'Sanitize_escapeJsString',
+                'PMA\libraries\Sanitize::escapeJsString',
+                array('is_safe' => array('html'))
+            ),
+        );
+    }
+}
diff --git a/libraries/twig/UtilExtension.php b/libraries/twig/UtilExtension.php
index 68e727e2b5..24ff82fbfc 100644
--- a/libraries/twig/UtilExtension.php
+++ b/libraries/twig/UtilExtension.php
@@ -25,15 +25,6 @@ class UtilExtension extends Twig_Extension
     public function getFunctions()
     {
         return array(
-            new Twig_SimpleFunction(
-                'Util_showIcons',
-                'PMA\libraries\Util::showIcons'
-            ),
-            new Twig_SimpleFunction(
-                'Util_getImage',
-                'PMA\libraries\Util::getImage',
-                array('is_safe' => array('html'))
-            ),
             new Twig_SimpleFunction(
                 'Util_formatSql',
                 'PMA\libraries\Util::formatSql',
@@ -44,6 +35,25 @@ class UtilExtension extends Twig_Extension
                 'PMA\libraries\Util::getHtmlTab',
                 array('is_safe' => array('html'))
             ),
+            new Twig_SimpleFunction(
+                'Util_getIcon',
+                'PMA\libraries\Util::getIcon',
+                array('is_safe' => array('html'))
+            ),
+            new Twig_SimpleFunction(
+                'Util_getImage',
+                'PMA\libraries\Util::getImage',
+                array('is_safe' => array('html'))
+            ),
+            new Twig_SimpleFunction(
+                'Util_getSupportedDatatypes',
+                'PMA\libraries\Util::getSupportedDatatypes',
+                array('is_safe' => array('html'))
+            ),
+            new Twig_SimpleFunction(
+                'Util_showIcons',
+                'PMA\libraries\Util::showIcons'
+            ),
         );
     }
 }
diff --git a/scripts/generate-twig-cache b/scripts/generate-twig-cache
index ef331ca938..6b079da2e2 100644
--- a/scripts/generate-twig-cache
+++ b/scripts/generate-twig-cache
@@ -5,6 +5,7 @@ require_once 'libraries/vendor_config.php';
 require_once AUTOLOAD_FILE;
 
 use PMA\libraries\twig\I18nExtension;
+use PMA\libraries\twig\SanitizeExtension;
 use PMA\libraries\twig\UrlExtension;
 use PMA\libraries\twig\UtilExtension;
 
@@ -18,6 +19,7 @@ $twig = new Twig_Environment($loader, array(
     'auto_reload' => true
 ));
 $twig->addExtension(new I18nExtension());
+$twig->addExtension(new SanitizeExtension());
 $twig->addExtension(new UrlExtension());
 $twig->addExtension(new UtilExtension());
 
diff --git a/templates/columns_definitions/column_adjust_privileges.phtml b/templates/columns_definitions/column_adjust_privileges.phtml
deleted file mode 100644
index 265fe9e2e6..0000000000
--- a/templates/columns_definitions/column_adjust_privileges.phtml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?php if ($privs_available) : ?>
-    <input name="field_adjust_privileges[<?= $columnNumber; ?>]"
-           id="field_<?= $columnNumber; ?>_<?= ($ci - $ci_offset); ?>"
-           checked="checked"
-           type="checkbox"
-           value="NULL"
-           class="allow_null"/>
-
-<?php else : ?>
-    <input name="field_adjust_privileges[<?= $columnNumber; ?>]"
-           id="field_<?= $columnNumber; ?>_<?= ($ci - $ci_offset); ?>"
-           disabled
-           type="checkbox"
-           value="NULL"
-           class="allow_null"
-           title="<?= __('You don\'t have sufficient privileges to perform this '
-           . 'operation; Please refer to the documentation for more details');?>"/>
-<?php endif; ?>
\ No newline at end of file
diff --git a/templates/columns_definitions/column_adjust_privileges.twig b/templates/columns_definitions/column_adjust_privileges.twig
new file mode 100644
index 0000000000..e316dae606
--- /dev/null
+++ b/templates/columns_definitions/column_adjust_privileges.twig
@@ -0,0 +1,16 @@
+{% if privs_available %}
+    <input name="field_adjust_privileges[{{ columnNumber }}]"
+        id="field_{{ columnNumber }}_{{ ci - ci_offset }}"
+        checked="checked"
+        type="checkbox"
+        value="NULL"
+        class="allow_null"/>
+{% else %}
+    <input name="field_adjust_privileges[{{ columnNumber }}]"
+        id="field_{{ columnNumber }}_{{ ci - ci_offset }}"
+        disabled
+        type="checkbox"
+        value="NULL"
+        class="allow_null"
+        title="{% trans "You don't have sufficient privileges to perform this operation; Please refer to the documentation for more details" %}"/>
+{% endif %}
diff --git a/templates/columns_definitions/column_auto_increment.phtml b/templates/columns_definitions/column_auto_increment.phtml
deleted file mode 100644
index e688ff6e7a..0000000000
--- a/templates/columns_definitions/column_auto_increment.phtml
+++ /dev/null
@@ -1,8 +0,0 @@
-<input name="field_extra[<?= $columnNumber; ?>]"
-       id="field_<?= $columnNumber?>_<?= ($ci - $ci_offset); ?>"
-       <?php if (isset($columnMeta['Extra'])
-                    && mb_strtolower($columnMeta['Extra']) == 'auto_increment'): ?>
-           checked="checked"
-       <?php endif; ?>
-       type="checkbox"
-       value="AUTO_INCREMENT" />
\ No newline at end of file
diff --git a/templates/columns_definitions/column_auto_increment.twig b/templates/columns_definitions/column_auto_increment.twig
new file mode 100644
index 0000000000..2729c838f0
--- /dev/null
+++ b/templates/columns_definitions/column_auto_increment.twig
@@ -0,0 +1,7 @@
+<input name="field_extra[{{ columnNumber }}]"
+    id="field_{{ columnNumber }}_{{ ci - ci_offset }}"
+    {% if columnMeta['Extra'] is defined and columnMeta['Extra']|lower == 'auto_increment' -%}
+        checked="checked"
+    {%- endif %}
+    type="checkbox"
+    value="AUTO_INCREMENT" />
diff --git a/templates/columns_definitions/column_extra.phtml b/templates/columns_definitions/column_extra.phtml
deleted file mode 100644
index d39268f535..0000000000
--- a/templates/columns_definitions/column_extra.phtml
+++ /dev/null
@@ -1,7 +0,0 @@
-<input name="col_extra[<?= $columnNumber;?>]"
-       id="field_<?= $columnNumber; ?>_<?= ($ci - $ci_offset); ?>"
-       <?php if (! empty($columnMeta['Extra']) && $columnMeta['Extra'] == 'auto_increment'): ?>
-           checked="checked"
-       <?php endif; ?>
-       type="checkbox"
-       value="auto_increment" />
\ No newline at end of file
diff --git a/templates/columns_definitions/column_extra.twig b/templates/columns_definitions/column_extra.twig
new file mode 100644
index 0000000000..769d9f0337
--- /dev/null
+++ b/templates/columns_definitions/column_extra.twig
@@ -0,0 +1,7 @@
+<input name="col_extra[{{ columnNumber }}]"
+    id="field_{{ columnNumber }}_{{ ci - ci_offset }}"
+    {% if columnMeta['Extra'] is not empty and columnMeta['Extra'] == 'auto_increment' -%}
+        checked="checked"
+    {%- endif %}
+    type="checkbox"
+    value="auto_increment" />
diff --git a/templates/columns_definitions/column_indexes.phtml b/templates/columns_definitions/column_indexes.phtml
deleted file mode 100644
index 94cf03aab2..0000000000
--- a/templates/columns_definitions/column_indexes.phtml
+++ /dev/null
@@ -1,30 +0,0 @@
-<select name="field_key[<?= $columnNumber;?>]"
-        id="field_<?= $columnNumber; ?>_<?= ($ci - $ci_offset);?>"
-        data-index="">
-    <option value="none_<?= $columnNumber; ?>">---</option>
-    <option value="primary_<?= $columnNumber; ?>"
-            title="<?= __("Primary"); ?>"
-            <?= ((isset($columnMeta['Key']) && $columnMeta['Key'] == 'PRI') ? 'selected="selected"' : '');?>>
-        PRIMARY
-    </option>
-    <option value="unique_<?= $columnNumber; ?>"
-            title="<?= __("Unique"); ?>"
-        <?= ((isset($columnMeta['Key']) && $columnMeta['Key'] == 'UNI') ? 'selected="selected"' : '');?>>
-        UNIQUE
-    </option>
-    <option value="index_<?= $columnNumber; ?>"
-            title="<?= __("Index"); ?>"
-        <?= ((isset($columnMeta['Key']) && $columnMeta['Key'] == 'MUL') ? 'selected="selected"' : '');?>>
-        INDEX
-    </option>
-    <option value="fulltext_<?= $columnNumber; ?>"
-            title="<?= __("Fulltext"); ?>"
-        <?= ((isset($columnMeta['Key']) && $columnMeta['Key'] == 'FULLTEXT') ? 'selected="selected"' : '');?>>
-        FULLTEXT
-    </option>
-    <option value="spatial_<?= $columnNumber; ?>"
-            title="<?= __("Spatial"); ?>"
-        <?= ((isset($columnMeta['Key']) && $columnMeta['Key'] == 'SPATIAL') ? 'selected="selected"' : '');?>>
-        SPATIAL
-    </option>
-</select>
\ No newline at end of file
diff --git a/templates/columns_definitions/column_indexes.twig b/templates/columns_definitions/column_indexes.twig
new file mode 100644
index 0000000000..99b5244948
--- /dev/null
+++ b/templates/columns_definitions/column_indexes.twig
@@ -0,0 +1,24 @@
+<select name="field_key[{{ columnNumber }}]"
+    id="field_{{ columnNumber }}_{{ ci - ci_offset }}" data-index="">
+    <option value="none_{{ columnNumber }}">---</option>
+    <option value="primary_{{ columnNumber }}" title="{% trans "Primary" %}"
+        {{- columnMeta['Key'] is defined and columnMeta['Key'] == 'PRI' ? ' selected="selected"' }}>
+        PRIMARY
+    </option>
+    <option value="unique_{{ columnNumber }}" title="{% trans "Unique" %}"
+        {{- columnMeta['Key'] is defined and columnMeta['Key'] == 'UNI' ? ' selected="selected"' }}>
+        UNIQUE
+    </option>
+    <option value="index_{{ columnNumber }}" title="{% trans "Index" %}"
+        {{- columnMeta['Key'] is defined and columnMeta['Key'] == 'MUL' ? ' selected="selected"' }}>
+        INDEX
+    </option>
+    <option value="fulltext_{{ columnNumber }}" title="{% trans "Fulltext" %}"
+        {{- columnMeta['Key'] is defined and columnMeta['Key'] == 'FULLTEXT' ? ' selected="selected"' }}>
+        FULLTEXT
+    </option>
+    <option value="spatial_{{ columnNumber }}" title="{% trans "Spatial" %}"
+        {{- columnMeta['Key'] is defined and columnMeta['Key'] == 'SPATIAL' ? ' selected="selected"' }}>
+        SPATIAL
+    </option>
+</select>
diff --git a/templates/columns_definitions/column_length.phtml b/templates/columns_definitions/column_length.phtml
deleted file mode 100644
index dafd5d7b41..0000000000
--- a/templates/columns_definitions/column_length.phtml
+++ /dev/null
@@ -1,11 +0,0 @@
-<input id="field_<?= $columnNumber; ?>_<?= ($ci - $ci_offset); ?>"
-       type="text"
-       name="field_length[<?= $columnNumber; ?>]"
-       size="<?= $length_values_input_size ?>"
-       value="<?= htmlspecialchars($length_to_display); ?>"
-       class="textfield" />
-<p class="enum_notice" id="enum_notice_<?= $columnNumber ?>_<?= ($ci - $ci_offset); ?>">
-    <a href="#" class="open_enum_editor">
-        <?= __('Edit ENUM/SET values'); ?>
-    </a>
-</p>
\ No newline at end of file
diff --git a/templates/columns_definitions/column_length.twig b/templates/columns_definitions/column_length.twig
new file mode 100644
index 0000000000..0d967a5397
--- /dev/null
+++ b/templates/columns_definitions/column_length.twig
@@ -0,0 +1,11 @@
+<input id="field_{{ columnNumber }}_{{ ci - ci_offset }}"
+    type="text"
+    name="field_length[{{ columnNumber }}]"
+    size="{{ length_values_input_size }}"
+    value="{{ length_to_display }}"
+    class="textfield" />
+<p class="enum_notice" id="enum_notice_{{ columnNumber }}_{{ ci - ci_offset }}">
+    <a href="#" class="open_enum_editor">
+        {% trans 'Edit ENUM/SET values' %}
+    </a>
+</p>
diff --git a/templates/columns_definitions/column_null.phtml b/templates/columns_definitions/column_null.phtml
deleted file mode 100644
index 72134ed310..0000000000
--- a/templates/columns_definitions/column_null.phtml
+++ /dev/null
@@ -1,8 +0,0 @@
-<input name="field_null[<?= $columnNumber; ?>]"
-       id="field_<?= $columnNumber; ?>_<?= ($ci - $ci_offset); ?>"
-       <?php if (! empty($columnMeta['Null']) && $columnMeta['Null'] != 'NO' && $columnMeta['Null'] != 'NOT NULL'): ?>
-           checked="checked"
-       <?php endif; ?>
-       type="checkbox"
-       value="NULL"
-       class="allow_null"/>
\ No newline at end of file
diff --git a/templates/columns_definitions/column_null.twig b/templates/columns_definitions/column_null.twig
new file mode 100644
index 0000000000..78eba4bdcc
--- /dev/null
+++ b/templates/columns_definitions/column_null.twig
@@ -0,0 +1,8 @@
+<input name="field_null[{{ columnNumber }}]"
+    id="field_{{ columnNumber }}_{{ ci - ci_offset }}"
+    {% if columnMeta['Null'] is not empty and columnMeta['Null'] != 'NO' and columnMeta['Null'] != 'NOT NULL' -%}
+        checked="checked"
+    {%- endif %}
+    type="checkbox"
+    value="NULL"
+    class="allow_null" />
diff --git a/templates/columns_definitions/column_type.phtml b/templates/columns_definitions/column_type.phtml
deleted file mode 100644
index ae2527ea7c..0000000000
--- a/templates/columns_definitions/column_type.phtml
+++ /dev/null
@@ -1,8 +0,0 @@
-<select class="column_type"
-        name="field_type[<?= $columnNumber; ?>]"
-        id="field_<?= $columnNumber; ?>_<?= ($ci - $ci_offset); ?>"
-        <?php if (isset($columnMeta['column_status']) && !$columnMeta['column_status']['isEditable']): ?>
-            disabled="disabled"
-        <?php endif; ?>>
-    <?= PMA\libraries\Util::getSupportedDatatypes(true, $type_upper); ?>
-</select>
\ No newline at end of file
diff --git a/templates/columns_definitions/column_type.twig b/templates/columns_definitions/column_type.twig
new file mode 100644
index 0000000000..83f4f500d0
--- /dev/null
+++ b/templates/columns_definitions/column_type.twig
@@ -0,0 +1,8 @@
+<select class="column_type"
+    name="field_type[{{ columnNumber }}]"
+    id="field_{{ columnNumber }}_{{ ci - ci_offset }}"
+    {%- if columnMeta['column_status'] is defined and not columnMeta['column_status']['isEditable'] -%}
+    disabled="disabled"
+    {%- endif %}>
+    {{ Util_getSupportedDatatypes(true, type_upper) }}
+</select>
diff --git a/templates/columns_definitions/transformation_option.phtml b/templates/columns_definitions/transformation_option.phtml
deleted file mode 100644
index bb19e3f0b9..0000000000
--- a/templates/columns_definitions/transformation_option.phtml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?php $options_key = $type_prefix . 'transformation_options'; ?>
-<input id="field_<?= $columnNumber; ?>_<?= ($ci - $ci_offset); ?>"
-       type="text"
-       name="field_<?= $options_key; ?>[<?= $columnNumber; ?>]"
-       size="16"
-       class="textfield"
-       value="<?= (isset($columnMeta['Field']) && isset($mime_map[$columnMeta['Field']][$options_key])) ?
-                htmlspecialchars($mime_map[$columnMeta['Field']][$options_key])
-                : '' ?>" />
diff --git a/templates/columns_definitions/transformation_option.twig b/templates/columns_definitions/transformation_option.twig
new file mode 100644
index 0000000000..27cbb49b04
--- /dev/null
+++ b/templates/columns_definitions/transformation_option.twig
@@ -0,0 +1,9 @@
+{% set options_key = type_prefix ~ 'transformation_options' %}
+<input id="field_{{ columnNumber }}_{{ ci - ci_offset }}"
+    type="text"
+    name="field_{{ options_key }}[{{ columnNumber }}]"
+    size="16"
+    class="textfield"
+    value="{% if columnMeta['Field'] is defined and mime_map[columnMeta['Field']][options_key] is defined -%}
+        {{- mime_map[columnMeta['Field']][options_key] -}}
+    {%- endif %}" />
diff --git a/templates/console/toolbar.twig b/templates/console/toolbar.twig
index 7241d910d6..35d25a40b9 100644
--- a/templates/console/toolbar.twig
+++ b/templates/console/toolbar.twig
@@ -2,7 +2,7 @@
     {% for content in contentArray %}
         {% if content is defined %}
         <div class="{{ content[0] }}">
-            {{ content['image'] ? content['image'] }}
+            {{ content['image'] is defined ? content['image']|raw }}
             <span>{{ content[1] }}</span>
         </div>
         {% endif %}
diff --git a/templates/database/designer/aggregate_query_panel.phtml b/templates/database/designer/aggregate_query_panel.twig
similarity index 82%
rename from templates/database/designer/aggregate_query_panel.phtml
rename to templates/database/designer/aggregate_query_panel.twig
index ec00ee917c..2b486027e9 100644
--- a/templates/database/designer/aggregate_query_panel.phtml
+++ b/templates/database/designer/aggregate_query_panel.twig
@@ -1,4 +1,4 @@
-<table id="query_Aggregate" style="display:none;"width="5%" cellpadding="0" cellspacing="0">
+<table id="query_Aggregate" style="display:none;" width="5%" cellpadding="0" cellspacing="0">
     <tbody>
         <tr>
             <td class="frams1" width="10px">
@@ -19,7 +19,7 @@
                         <tr>
                             <td colspan="2" class="center nowrap">
                                 <strong>
-                                    <?= __('Aggregate'); ?>
+                                    {% trans 'Aggregate' %}
                                 </strong>
                             </td>
                         </tr>
@@ -27,7 +27,7 @@
                     <tbody>
                         <tr>
                             <td width="58" class="nowrap">
-                                <?= __('Operator'); ?>
+                                {% trans 'Operator' %}
                             </td>
                             <td width="102">
                                 <select name="operator" id="e_operator">
@@ -56,12 +56,13 @@
                     <tbody>
                         <tr>
                             <td colspan="2" class="center nowrap">
-                                <input type="button" id="ok_edit_Aggr" class="butt" name="Button" value="<?= __('OK'); ?>" />
+                                <input type="button" id="ok_edit_Aggr" class="butt"
+                                    name="Button" value="{% trans 'OK' %}" />
                                 <input type="button"
-                                       class="butt"
-                                       name="Button"
-                                       value="<?= __('Cancel'); ?>"
-                                       onclick="document.getElementById('query_Aggregate').style.display = 'none';" />
+                                    class="butt"
+                                    name="Button"
+                                    value="{% trans 'Cancel' %}"
+                                    onclick="document.getElementById('query_Aggregate').style.display = 'none';" />
                             </td>
                         </tr>
                     </tbody>
@@ -81,4 +82,4 @@
             </td>
         </tr>
     </tbody>
-</table>
\ No newline at end of file
+</table>
diff --git a/templates/database/designer/canvas.phtml b/templates/database/designer/canvas.twig
similarity index 92%
rename from templates/database/designer/canvas.phtml
rename to templates/database/designer/canvas.twig
index 5110ccc0a7..f81e7887b8 100644
--- a/templates/database/designer/canvas.phtml
+++ b/templates/database/designer/canvas.twig
@@ -1,3 +1,3 @@
 <div id="osn_tab">
     <canvas class="pmd" id="canvas" width="100" height="100" ></canvas>
-</div>
\ No newline at end of file
+</div>
diff --git a/templates/database/designer/delete_relation_panel.phtml b/templates/database/designer/delete_relation_panel.twig
similarity index 84%
rename from templates/database/designer/delete_relation_panel.phtml
rename to templates/database/designer/delete_relation_panel.twig
index 970baea359..84be755bef 100644
--- a/templates/database/designer/delete_relation_panel.phtml
+++ b/templates/database/designer/delete_relation_panel.twig
@@ -18,14 +18,16 @@
                     <tr>
                         <td colspan="3" class="center nowrap">
                             <strong>
-                                <?= __('Delete relationship'); ?>
+                                {% trans 'Delete relationship' %}
                             </strong>
                         </td>
                     </tr>
                     <tr>
                         <td colspan="3" class="center nowrap">
-                            <input id="del_button" name="Button" type="button" class="butt" value="<?= __('Delete'); ?>" />
-                            <input id="cancel_button" type="button" class="butt" name="Button" value="<?= __('Cancel'); ?>" />
+                            <input id="del_button" name="Button" type="button"
+                                class="butt" value="{% trans 'Delete' %}" />
+                            <input id="cancel_button" type="button" class="butt"
+                                name="Button" value="{% trans 'Cancel' %}" />
                         </td>
                     </tr>
                 </table>
@@ -44,4 +46,4 @@
             </td>
         </tr>
     </tbody>
-</table>
\ No newline at end of file
+</table>
diff --git a/templates/database/designer/having_query_panel.phtml b/templates/database/designer/having_query_panel.twig
similarity index 89%
rename from templates/database/designer/having_query_panel.phtml
rename to templates/database/designer/having_query_panel.twig
index 963d50d942..c5828a8acc 100644
--- a/templates/database/designer/having_query_panel.phtml
+++ b/templates/database/designer/having_query_panel.twig
@@ -27,7 +27,7 @@
                     <tbody id="rename_to">
                         <tr>
                             <td width="58" class="nowrap">
-                                <?= __('Operator'); ?>
+                                {% trans 'Operator' %}
                             </td>
                             <td width="102">
                                 <select name="hoperator" id="hoperator">
@@ -58,7 +58,7 @@
                         <tr>
                             <tr>
                                 <td width="58" class="nowrap">
-                                    <?= __('Operator'); ?>
+                                    {% trans 'Operator' %}
                                 </td>
                                 <td width="102">
                                     <select name="hrel_opt" id="hrel_opt">
@@ -87,7 +87,7 @@
                                             IN
                                         </option>
                                         <option value="EXCEPT">
-                                            <?= __('Except'); ?>
+                                            {% trans 'Except' %}
                                         </option>
                                         <option value="NOT IN">
                                             NOT IN
@@ -97,9 +97,9 @@
                         </tr>
                         <tr>
                             <td class="nowrap">
-                                <?= __('Value'); ?>
+                                {% trans 'Value' %}
                                 <br />
-                                <?= __('subquery'); ?>
+                                {% trans 'subquery' %}
                             </td>
                             <td>
                                 <textarea id="hQuery" cols="18">
@@ -110,12 +110,13 @@
                     <tbody>
                         <tr>
                             <td colspan="2" class="center nowrap">
-                                <input type="button" id="ok_edit_having" class="butt" name="Button" value="<?= __('OK'); ?>" />
+                                <input type="button" id="ok_edit_having" class="butt"
+                                    name="Button" value="{% trans 'OK' %}" />
                                 <input type="button"
-                                       class="butt"
-                                       name="Button"
-                                       value="<?= __('Cancel'); ?>"
-                                       onclick="document.getElementById('query_having').style.display = 'none';" />
+                                    class="butt"
+                                    name="Button"
+                                    value="{% trans 'Cancel' %}"
+                                    onclick="document.getElementById('query_having').style.display = 'none';" />
                             </td>
                         </tr>
                     </tbody>
diff --git a/templates/database/designer/new_relation_panel.phtml b/templates/database/designer/new_relation_panel.twig
similarity index 93%
rename from templates/database/designer/new_relation_panel.phtml
rename to templates/database/designer/new_relation_panel.twig
index 60df319658..39297dc939 100644
--- a/templates/database/designer/new_relation_panel.phtml
+++ b/templates/database/designer/new_relation_panel.twig
@@ -19,7 +19,7 @@
                         <tr>
                             <td colspan="2" class="center nowrap">
                                 <strong>
-                                    <?= __('Create relationship'); ?>
+                                    {% trans 'Create relationship' %}
                                 </strong>
                             </td>
                         </tr>
@@ -84,8 +84,10 @@
                     <tbody>
                         <tr>
                             <td colspan="2" class="center nowrap">
-                                <input type="button" id="ok_new_rel_panel" class="butt" name="Button" value="<?= __('OK'); ?>" />
-                                <input type="button" id="cancel_new_rel_panel" class="butt" name="Button" value="<?= __('Cancel'); ?>" />
+                                <input type="button" id="ok_new_rel_panel" class="butt"
+                                    name="Button" value="{% trans 'OK' %}" />
+                                <input type="button" id="cancel_new_rel_panel"
+                                    class="butt" name="Button" value="{% trans 'Cancel' %}" />
                             </td>
                         </tr>
                     </tbody>
@@ -105,4 +107,4 @@
             </td>
         </tr>
     </tbody>
-</table>
\ No newline at end of file
+</table>
diff --git a/templates/database/designer/options_panel.phtml b/templates/database/designer/options_panel.twig
similarity index 91%
rename from templates/database/designer/options_panel.phtml
rename to templates/database/designer/options_panel.twig
index d1f57a6289..e6095ed80d 100644
--- a/templates/database/designer/options_panel.phtml
+++ b/templates/database/designer/options_panel.twig
@@ -31,7 +31,7 @@
                         </tr>
                         <tr>
                             <td width="58" class="nowrap">
-                                <?= __('Relationship operator'); ?>
+                                {% trans 'Relationship operator' %}
                             </td>
                             <td width="102">
                                 <select name="rel_opt" id="rel_opt">
@@ -60,7 +60,7 @@
                                         IN
                                     </option>
                                     <option value="EXCEPT">
-                                        <?= __('Except'); ?>
+                                        {% trans 'Except' %}
                                     </option>
                                     <option value="NOT IN">
                                         NOT IN
@@ -70,9 +70,9 @@
                         </tr>
                         <tr>
                             <td class="nowrap">
-                                <?= __('Value'); ?>
+                                {% trans 'Value' %}
                                 <br />
-                                <?= __('subquery'); ?>
+                                {% trans 'subquery' %}
                             </td>
                             <td>
                                 <textarea id="Query" cols="18">
@@ -82,13 +82,13 @@
                         <tr>
                             <td class="center nowrap">
                                 <b>
-                                    <?= __('Rename to'); ?>
+                                    {% trans 'Rename to' %}
                                 </b>
                             </td>
                         </tr>
                         <tr>
                             <td width="58" class="nowrap">
-                                <?= __('New name'); ?>
+                                {% trans 'New name' %}
                             </td>
                             <td width="102">
                                 <input type="text" id="new_name"/>
@@ -97,13 +97,13 @@
                         <tr>
                             <td class="center nowrap">
                                 <b>
-                                    <?= __('Aggregate'); ?>
+                                    {% trans 'Aggregate' %}
                                 </b>
                             </td>
                         </tr>
                         <tr>
                             <td width="58" class="nowrap">
-                                <?= __('Operator'); ?>
+                                {% trans 'Operator' %}
                             </td>
                             <td width="102">
                                 <select name="operator" id="operator">
@@ -167,7 +167,7 @@
                         </tr>
                         <tr>
                             <td width="58" class="nowrap">
-                                <?= __('Operator'); ?>
+                                {% trans 'Operator' %}
                             </td>
                             <td width="102">
                                 <select name="h_operator" id="h_operator">
@@ -175,7 +175,7 @@
                                         ---
                                     </option>
                                     <option value="None" >
-                                        <?= __('None'); ?>
+                                        {% trans 'None' %}
                                     </option>
                                     <option value="sum" >
                                         SUM
@@ -197,7 +197,7 @@
                         </tr>
                         <tr>
                             <td width="58" class="nowrap">
-                                <?= __('Relationship operator'); ?>
+                                {% trans 'Relationship operator' %}
                             </td>
                             <td width="102">
                                 <select name="h_rel_opt" id="h_rel_opt">
@@ -226,7 +226,7 @@
                                         IN
                                     </option>
                                     <option value="EXCEPT">
-                                        <?= __('Except'); ?>
+                                        {% trans 'Except' %}
                                     </option>
                                     <option value="NOT IN">
                                         NOT IN
@@ -236,9 +236,9 @@
                         </tr>
                         <tr>
                             <td width="58" class="nowrap">
-                                <?= __('Value'); ?>
+                                {% trans 'Value' %}
                                 <br/>
-                                <?= __('subquery'); ?>
+                                {% trans 'subquery' %}
                             </td>
                             <td width="102">
                                 <textarea id="having" cols="18">
@@ -249,8 +249,10 @@
                     <tbody>
                         <tr>
                             <td colspan="2" class="center nowrap">
-                                <input type="button" id="ok_add_object" class="butt" name="Button" value="<?= __('OK'); ?>" />
-                                <input type="button" id="cancel_close_option" class="butt" name="Button" value="<?= __('Cancel'); ?>" />
+                                <input type="button" id="ok_add_object" class="butt"
+                                    name="Button" value="{% trans 'OK' %}" />
+                                <input type="button" id="cancel_close_option" class="butt"
+                                    name="Button" value="{% trans 'Cancel' %}" />
                             </td>
                         </tr>
                     </tbody>
diff --git a/templates/database/designer/rename_to_panel.phtml b/templates/database/designer/rename_to_panel.twig
similarity index 79%
rename from templates/database/designer/rename_to_panel.phtml
rename to templates/database/designer/rename_to_panel.twig
index 903f9354d5..b3e1ba37b4 100644
--- a/templates/database/designer/rename_to_panel.phtml
+++ b/templates/database/designer/rename_to_panel.twig
@@ -1,4 +1,3 @@
-
 <table id="query_rename_to" style="display:none;" width="5%" cellpadding="0" cellspacing="0">
     <tbody>
         <tr>
@@ -20,7 +19,7 @@
                         <tr>
                             <td colspan="2" class="center nowrap">
                                 <strong>
-                                    <?= __('Rename to'); ?>
+                                    {% trans 'Rename to' %}
                                 </strong>
                             </td>
                         </tr>
@@ -28,7 +27,7 @@
                     <tbody id="rename_to">
                         <tr>
                             <td width="58" class="nowrap">
-                                <?= __('New name'); ?>
+                                {% trans 'New name' %}
                             </td>
                             <td width="102">
                                 <input type="text" id="e_rename"/>
@@ -38,12 +37,13 @@
                     <tbody>
                         <tr>
                             <td colspan="2" class="center nowrap">
-                                <input type="button" id="ok_edit_rename" class="butt" name="Button" value="<?= __('OK'); ?>" />
+                                <input type="button" id="ok_edit_rename" class="butt"
+                                    name="Button" value="{% trans 'OK' %}" />
                                 <input type="button"
-                                       class="butt"
-                                       name="Button"
-                                       value="<?= __('Cancel'); ?>"
-                                       onclick="document.getElementById('query_rename_to').style.display = 'none';" />
+                                    class="butt"
+                                    name="Button"
+                                    value="{% trans 'Cancel' %}"
+                                    onclick="document.getElementById('query_rename_to').style.display = 'none';" />
                             </td>
                         </tr>
                     </tbody>
diff --git a/templates/database/designer/where_query_panel.phtml b/templates/database/designer/where_query_panel.twig
similarity index 86%
rename from templates/database/designer/where_query_panel.phtml
rename to templates/database/designer/where_query_panel.twig
index ffca59c3f5..7435dfb0b4 100644
--- a/templates/database/designer/where_query_panel.phtml
+++ b/templates/database/designer/where_query_panel.twig
@@ -1,4 +1,4 @@
-<table id="query_where" style="display:none;"width="5%" cellpadding="0" cellspacing="0">
+<table id="query_where" style="display:none;" width="5%" cellpadding="0" cellspacing="0">
     <tbody>
         <tr>
             <td class="frams1" width="10px">
@@ -27,7 +27,7 @@
                     <tbody id="rename_to">
                         <tr>
                             <td width="58" class="nowrap">
-                                <?= __('Operator'); ?>
+                                {% trans 'Operator' %}
                             </td>
                             <td width="102">
                                 <select name="erel_opt" id="erel_opt">
@@ -56,7 +56,7 @@
                                         IN
                                     </option>
                                     <option value="EXCEPT">
-                                        <?= __('Except'); ?>
+                                        {% trans 'Except' %}
                                     </option>
                                     <option value="NOT IN">
                                         NOT IN
@@ -66,9 +66,9 @@
                         </tr>
                         <tr>
                             <td class="nowrap">
-                                <?= __('Value'); ?>
+                                {% trans 'Value' %}
                                 <br />
-                                <?= __('subquery'); ?>
+                                {% trans 'subquery' %}
                             </td>
                             <td>
                                 <textarea id="eQuery" cols="18">
@@ -79,8 +79,10 @@
                     <tbody>
                         <tr>
                             <td colspan="2" class="center nowrap">
-                                <input type="button" id="ok_edit_where" class="butt" name="Button" value="<?= __('OK'); ?>" />
-                                <input type="button" class="butt" name="Button" value="<?= __('Cancel'); ?>" onclick="document.getElementById('query_where').style.display = 'none'" />
+                                <input type="button" id="ok_edit_where" class="butt"
+                                    name="Button" value="{% trans 'OK' %}" />
+                                <input type="button" class="butt" name="Button" value="{% trans 'Cancel' %}"
+                                    onclick="document.getElementById('query_where').style.display = 'none'" />
                             </td>
                         </tr>
                     </tbody>
diff --git a/templates/database/structure/browse_table.phtml b/templates/database/structure/browse_table.phtml
deleted file mode 100644
index afdfd1a38c..0000000000
--- a/templates/database/structure/browse_table.phtml
+++ /dev/null
@@ -1,3 +0,0 @@
-<a href="sql.php<?= $tbl_url_query; ?>&amp;pos=0">
-    <?= $title; ?>
-</a>
\ No newline at end of file
diff --git a/templates/database/structure/browse_table.twig b/templates/database/structure/browse_table.twig
new file mode 100644
index 0000000000..9d3ad64022
--- /dev/null
+++ b/templates/database/structure/browse_table.twig
@@ -0,0 +1,3 @@
+<a href="sql.php{{ tbl_url_query }}&amp;pos=0">
+    {{ title|raw }}
+</a>
diff --git a/templates/database/structure/browse_table_label.phtml b/templates/database/structure/browse_table_label.phtml
deleted file mode 100644
index 53b1b28628..0000000000
--- a/templates/database/structure/browse_table_label.phtml
+++ /dev/null
@@ -1,3 +0,0 @@
-<a href="sql.php<?= $tbl_url_query; ?>&amp;pos=0" title="<?= $title; ?>">
-    <?= $truename; ?>
-</a>
\ No newline at end of file
diff --git a/templates/database/structure/browse_table_label.twig b/templates/database/structure/browse_table_label.twig
new file mode 100644
index 0000000000..3a024929d6
--- /dev/null
+++ b/templates/database/structure/browse_table_label.twig
@@ -0,0 +1,3 @@
+<a href="sql.php{{ tbl_url_query }}&amp;pos=0" title="{{ title }}">
+    {{ truename }}
+</a>
diff --git a/templates/database/structure/empty_table.phtml b/templates/database/structure/empty_table.phtml
deleted file mode 100644
index 00a58c6b5c..0000000000
--- a/templates/database/structure/empty_table.phtml
+++ /dev/null
@@ -1,3 +0,0 @@
-<a class="truncate_table_anchor ajax" href="sql.php<?= $tbl_url_query; ?>&amp;sql_query=<?= $sql_query; ?>&amp;message_to_show=<?= $message_to_show; ?>">
-    <?= $title; ?>
-</a>
\ No newline at end of file
diff --git a/templates/database/structure/empty_table.twig b/templates/database/structure/empty_table.twig
new file mode 100644
index 0000000000..aab917576f
--- /dev/null
+++ b/templates/database/structure/empty_table.twig
@@ -0,0 +1,4 @@
+<a class="truncate_table_anchor ajax" href="sql.php{{ tbl_url_query }}&amp;sql_query=
+{{- sql_query }}&amp;message_to_show={{ message_to_show }}">
+    {{ title|raw }}
+</a>
diff --git a/templates/database/structure/print_view_data_dictionary_link.phtml b/templates/database/structure/print_view_data_dictionary_link.phtml
deleted file mode 100644
index d1830b1e0c..0000000000
--- a/templates/database/structure/print_view_data_dictionary_link.phtml
+++ /dev/null
@@ -1,7 +0,0 @@
-<p class="print_ignore">
-    <a href="#" id="printView">
-        <?= PMA\libraries\Util::getIcon('b_print.png', __('Print'), true); ?>
-    </a>
-    <a href="db_datadict.php<?= $url_query; ?>" target="print_view">
-        <?= PMA\libraries\Util::getIcon('b_tblanalyse.png', __('Data dictionary'), true); ?></a>
-</p>
\ No newline at end of file
diff --git a/templates/database/structure/print_view_data_dictionary_link.twig b/templates/database/structure/print_view_data_dictionary_link.twig
new file mode 100644
index 0000000000..d04980713d
--- /dev/null
+++ b/templates/database/structure/print_view_data_dictionary_link.twig
@@ -0,0 +1,8 @@
+<p class="print_ignore">
+    <a href="#" id="printView">
+        {{ Util_getIcon('b_print.png', 'Print'|trans, true) }}
+    </a>
+    <a href="db_datadict.php{{ url_query }}" target="print_view">
+        {{ Util_getIcon('b_tblanalyse.png', 'Data dictionary'|trans, true) }}
+    </a>
+</p>
diff --git a/templates/database/structure/search_table.phtml b/templates/database/structure/search_table.phtml
deleted file mode 100644
index 043f92bac7..0000000000
--- a/templates/database/structure/search_table.phtml
+++ /dev/null
@@ -1,3 +0,0 @@
-<a href="tbl_select.php<?= $tbl_url_query; ?>">
-    <?= $title; ?>
-</a>
\ No newline at end of file
diff --git a/templates/database/structure/search_table.twig b/templates/database/structure/search_table.twig
new file mode 100644
index 0000000000..8c358d39e9
--- /dev/null
+++ b/templates/database/structure/search_table.twig
@@ -0,0 +1,3 @@
+<a href="tbl_select.php{{ tbl_url_query }}">
+    {{ title|raw }}
+</a>
diff --git a/templates/database/structure/tracking_icon.phtml b/templates/database/structure/tracking_icon.phtml
deleted file mode 100644
index fea22c470a..0000000000
--- a/templates/database/structure/tracking_icon.phtml
+++ /dev/null
@@ -1,11 +0,0 @@
-<a href="tbl_tracking.php<?= $url_query; ?>&amp;table=<?= $truename; ?>">
-    <?php if ($is_tracked): ?>
-        <?= PMA\libraries\Util::getImage(
-            'eye.png', __('Tracking is active.')
-        ); ?>
-    <?php else: ?>
-        <?= PMA\libraries\Util::getImage(
-            'eye_grey.png', __('Tracking is not active.')
-        ); ?>
-    <?php endif; ?>
-</a>
\ No newline at end of file
diff --git a/templates/database/structure/tracking_icon.twig b/templates/database/structure/tracking_icon.twig
new file mode 100644
index 0000000000..180baab6cb
--- /dev/null
+++ b/templates/database/structure/tracking_icon.twig
@@ -0,0 +1,7 @@
+<a href="tbl_tracking.php{{ url_query }}&amp;table={{ truename }}">
+    {% if is_tracked -%}
+        {{ Util_getImage('eye.png', 'Tracking is active.'|trans) }}
+    {%- else -%}
+        {{ Util_getImage('eye_grey.png', 'Tracking is not active.'|trans) }}
+    {%- endif %}
+</a>
diff --git a/templates/header_location.phtml b/templates/header_location.phtml
deleted file mode 100644
index f149f0f718..0000000000
--- a/templates/header_location.phtml
+++ /dev/null
@@ -1,32 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * Manage HTML redirection
- *
- * @package PhpMyAdmin-template
- *
- * @param string $uri Redirection location
- */
-$uri = isset($uri) ? $uri : null;
-?>
-<html>
-<head>
-    <title>- - -</title>
-    <meta http-equiv="expires" content="0" />
-    <meta http-equiv="Pragma" content="no-cache" />
-    <meta http-equiv="Cache-Control" content="no-cache" />
-    <meta http-equiv="Refresh" content="0;url=<?= htmlspecialchars($uri) ?>" />
-    <script type="text/javascript">
-        //<![CDATA[
-        setTimeout("window.location = decodeURI('<?= PMA\libraries\Sanitize::escapeJsString($uri) ?>')", 2000);
-        //]]>
-    </script>
-</head>
-<body>
-<script type="text/javascript">
-    //<![CDATA[
-    document.write('<p><a href="<?= PMA\libraries\Sanitize::escapeJsString(htmlspecialchars($uri)) ?>"><?php echo __('Go') ?></a></p>');
-    //]]>
-</script>
-</body>
-</html>
diff --git a/templates/header_location.twig b/templates/header_location.twig
new file mode 100644
index 0000000000..8925bd99f6
--- /dev/null
+++ b/templates/header_location.twig
@@ -0,0 +1,22 @@
+{# Manage HTML redirection #}
+<html>
+<head>
+    <title>- - -</title>
+    <meta http-equiv="expires" content="0" />
+    <meta http-equiv="Pragma" content="no-cache" />
+    <meta http-equiv="Cache-Control" content="no-cache" />
+    <meta http-equiv="Refresh" content="0;url={{ uri }}" />
+    <script type="text/javascript">
+        //<![CDATA[
+        setTimeout("window.location = decodeURI('{{ Sanitize_escapeJsString(uri) }}')", 2000);
+        //]]>
+    </script>
+</head>
+<body>
+<script type="text/javascript">
+    //<![CDATA[
+    document.write('<p><a href="{{ Sanitize_escapeJsString(uri|e) }}">{% trans 'Go' %}</a></p>');
+    //]]>
+</script>
+</body>
+</html>