diff --git a/datamodels/2.x/itop-core-update/view/ConfirmUpdate.html.twig b/datamodels/2.x/itop-core-update/view/ConfirmUpdate.html.twig
index 8f52797fd..c9d99c7db 100644
--- a/datamodels/2.x/itop-core-update/view/ConfirmUpdate.html.twig
+++ b/datamodels/2.x/itop-core-update/view/ConfirmUpdate.html.twig
@@ -30,11 +30,11 @@
         {% UIFieldSet Standard {'sLegend':'iTopUpdate:UI:Action'|dict_s} %}
             {% UIAlert ForWarning {'sContent':'iTopUpdate:UI:WarningReadOnlyDuringUpdate'|dict_s, 'IsCollapsible':false, 'IsClosable':false} %}{% EndUIAlert %}
 
-            {% UIContentBlock Standard {aContainerClasses:["ibo-setup--button-bar"]} %}
+            {% UIToolbar ForButton {} %}
                 {% UIForm Standard {'CSSClasses':['form-inline']} %}
-                    {% UIButton ForSecondaryAction {'sId':'cancel-update', 'sLabel':'iTopUpdate:UI:Cancel'|dict_s, 'bIsSubmit':true} %}
+                    {% UIButton ForCancel {'sId':'cancel-update', 'sLabel':'iTopUpdate:UI:Cancel'|dict_s, 'bIsSubmit':true} %}
                 {% EndUIForm %}
-                {% UIContentBlock Standard {aContainerClasses:["ibo-setup--button-spacer"]} %}{% EndUIContentBlock %}
+                {% UIToolbarSpacer Standard {} %}
                 {% UIForm Standard {'CSSClasses':['form-inline']} %}
                     {% UIButton ForPrimaryAction {'sId':'do-update', 'sLabel':'iTopUpdate:UI:DoUpdate'|dict_s, 'bIsSubmit':true} %}
                     {% UIInput ForHidden {'sName':'operation', 'sValue':'UpdateCoreFiles'} %}
@@ -43,7 +43,7 @@
                     {% UIInput ForHidden {'sName':'doBackup', 'sValue':bDoBackup} %}
                     {% UIInput ForHidden {'sName':'doFilesArchive', 'sValue':bDoFilesArchive} %}
                 {% EndUIForm %}
-            {% EndUIContentBlock %}
+            {% EndUIToolbar %}
 
         {% EndUIFieldSet %}
 
diff --git a/datamodels/2.x/itop-core-update/view/SelectUpdateFile.html.twig b/datamodels/2.x/itop-core-update/view/SelectUpdateFile.html.twig
index a1960f9f6..241e08347 100644
--- a/datamodels/2.x/itop-core-update/view/SelectUpdateFile.html.twig
+++ b/datamodels/2.x/itop-core-update/view/SelectUpdateFile.html.twig
@@ -56,21 +56,21 @@
                     {% EndUIContentBlock %}
                 {% EndUIAlert %}
 
-                {% UIContentBlock Standard {'aContainerClasses':['upload_container']} %}
-                    {% UIInput Standard {'sType':'file', 'sId':'file', 'sName':'file', 'sValue':''} %}
-                {% EndUIContentBlock %}
+                {% UIFileSelect Standard {sName: 'file', sId: 'file'} %}
 
                 {% UIAlert ForWarning {'sId':'dobackup-warning', 'IsHidden':true} %}
                     {{ 'iTopUpdate:UI:DoBackup:Warning'|dict_s }}
                 {% EndUIAlert %}
 
-                {% UIField Standard {'sLabel':'iTopUpdate:UI:DoBackup:Label'|dict_s, 'sLayout':'large'} %}
+                {% UIContentBlock Standard {'aContainerClasses':['ibo-font-ral-nor-150']} %}
                     {% UIInput Standard {'sType':'checkbox', 'sId':'doBackup', 'sName':'doBackup', 'sValue':'1', 'IsChecked':true} %}
-                {% EndUIField %}
+                    {{ 'iTopUpdate:UI:DoBackup:Label'|dict_s }}
+                {% EndUIContentBlock %}
 
-                {% UIField Standard {'sLabel':'iTopUpdate:UI:DoFilesArchive'|dict_s, 'sLayout':'large'} %}
+                {% UIContentBlock Standard {'aContainerClasses':['ibo-font-ral-nor-150']} %}
                     {% UIInput Standard {'sType':'checkbox', 'sId':'doFilesArchive', 'sName':'doFilesArchive', 'sValue':'1', 'IsChecked':true} %}
-                {% EndUIField %}
+                    {{ 'iTopUpdate:UI:DoFilesArchive'|dict_s }}
+                {% EndUIContentBlock %}
 
                 {% UIContentBlock Standard {'aContainerClasses':['ibo_check_update_submit']} %}
                     {% UIButton ForPrimaryAction {'sLabel':'iTopUpdate:UI:CheckUpdate'|dict_s, 'sId':'check-update', 'bIsSubmit':true, 'IsDisabled':true} %}