diff --git a/.idea/webServers.xml b/.idea/webServers.xml
index 82acebb1..bb73a126 100644
--- a/.idea/webServers.xml
+++ b/.idea/webServers.xml
@@ -2,13 +2,6 @@
 <project version="4">
   <component name="WebServers">
     <option name="servers">
-      <webServer id="c01b8916-f9bb-46f4-a585-5f4f4064aa87" name="SK-IMN" url="http://sk-imn.imnavajas.es">
-        <fileTransfer host="sk-imn.imnavajas.es" port="21">
-          <advancedOptions>
-            <advancedOptions dataProtectionLevel="Private" passiveMode="true" shareSSLContext="true" />
-          </advancedOptions>
-        </fileTransfer>
-      </webServer>
       <webServer id="b340ea2c-6cfa-4862-a020-5d4f6e482cc1" name="SK-MAIN" url="http://sk-main.imnavajas.es">
         <fileTransfer host="sk-main.imnavajas.es" port="21">
           <advancedOptions>
@@ -16,6 +9,22 @@
           </advancedOptions>
         </fileTransfer>
       </webServer>
+      <webServer id="c01b8916-f9bb-46f4-a585-5f4f4064aa87" name="SK-IMN" url="http://sk-imn.imnavajas.es">
+        <fileTransfer host="sk-imn.imnavajas.es" port="21">
+          <advancedOptions>
+            <advancedOptions dataProtectionLevel="Private" passiveMode="true" shareSSLContext="true" />
+          </advancedOptions>
+        </fileTransfer>
+      </webServer>
     </option>
+    <groups>
+      <group>
+        <name>DEV/UI</name>
+        <servers>
+          <name value="SK-MAIN" />
+          <name value="SK-IMN" />
+        </servers>
+      </group>
+    </groups>
   </component>
 </project>
\ No newline at end of file
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 3eace43c..b8a162b9 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -5,6 +5,7 @@
   </component>
   <component name="ChangeListManager">
     <list default="true" id="7c8f7059-cd40-417c-936e-48dbc0507d86" name="Changes" comment="Add static Vuexy files">
+<<<<<<< HEAD
       <change afterPath="$PROJECT_DIR$/ci4/app/Controllers/Compras/Compras.php" afterDir="false" />
       <change afterPath="$PROJECT_DIR$/ci4/app/Controllers/Compras/Productos.php" afterDir="false" />
       <change afterPath="$PROJECT_DIR$/ci4/app/Controllers/Importacion/Importar.php" afterDir="false" />
@@ -23,6 +24,17 @@
       <change beforePath="$PROJECT_DIR$/ci4/app/Views/themes/backend/vuexy/form/settings/index.php" beforeDir="false" afterPath="$PROJECT_DIR$/ci4/app/Views/themes/backend/vuexy/form/settings/index.php" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/ci4/app/Views/themes/backend/vuexy/main/all.php" beforeDir="false" afterPath="$PROJECT_DIR$/ci4/app/Views/themes/backend/vuexy/main/all.php" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/ci4/app/Views/themes/backend/vuexy/main/defaultlayout.php" beforeDir="false" afterPath="$PROJECT_DIR$/ci4/app/Views/themes/backend/vuexy/main/defaultlayout.php" afterDir="false" />
+=======
+      <change beforePath="$PROJECT_DIR$/.idea/webServers.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/webServers.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/ci4/app/Language/en/Users.php" beforeDir="false" afterPath="$PROJECT_DIR$/ci4/app/Language/en/Users.php" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/ci4/app/Language/es/Users.php" beforeDir="false" afterPath="$PROJECT_DIR$/ci4/app/Language/es/Users.php" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/ci4/app/Views/themes/backend/vuexy/form/configuracion/paises/viewPaisForm.php" beforeDir="false" afterPath="$PROJECT_DIR$/ci4/app/Views/themes/backend/vuexy/form/configuracion/paises/viewPaisForm.php" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/ci4/app/Views/themes/backend/vuexy/form/configuracion/paises/viewPaisList.php" beforeDir="false" afterPath="$PROJECT_DIR$/ci4/app/Views/themes/backend/vuexy/form/configuracion/paises/viewPaisList.php" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/ci4/app/Views/themes/backend/vuexy/form/configuracion/papel/viewPapelGenericoForm.php" beforeDir="false" afterPath="$PROJECT_DIR$/ci4/app/Views/themes/backend/vuexy/form/configuracion/papel/viewPapelGenericoForm.php" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/ci4/app/Views/themes/backend/vuexy/form/configuracion/papel/viewPapelImpresionForm.php" beforeDir="false" afterPath="$PROJECT_DIR$/ci4/app/Views/themes/backend/vuexy/form/configuracion/papel/viewPapelImpresionForm.php" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/ci4/app/Views/themes/backend/vuexy/form/user/_userFormItems.php" beforeDir="false" afterPath="$PROJECT_DIR$/ci4/app/Views/themes/backend/vuexy/form/user/_userFormItems.php" afterDir="false" />
+>>>>>>> 38e9feb4c8537689e5d266a1dbe3371003d2457f
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -106,8 +118,12 @@
       <workItem from="1685038598644" duration="6958000" />
       <workItem from="1685102978387" duration="3272000" />
       <workItem from="1685266094611" duration="3469000" />
+<<<<<<< HEAD
       <workItem from="1685365444846" duration="191000" />
       <workItem from="1685689980219" duration="12098000" />
+=======
+      <workItem from="1685564762632" duration="2787000" />
+>>>>>>> 38e9feb4c8537689e5d266a1dbe3371003d2457f
     </task>
     <task id="LOCAL-00001" summary="Starting Vuexy Theme creation">
       <created>1682339938559</created>
diff --git a/ci4/app/Language/en/Users.php b/ci4/app/Language/en/Users.php
index e77bdcff..9260533d 100644
--- a/ci4/app/Language/en/Users.php
+++ b/ci4/app/Language/en/Users.php
@@ -4,7 +4,12 @@
 
 return [
 		'address' => 'Address',
-		'blocked' => 'Blocked',
+        'blocked' => 'Blocked',
+        'non_blocked' => 'Non Blocked',
+        'global_active' => 'Enabled',
+        'global_inactive' => 'Disabled',
+        'email_confirmed' => 'Confirmed',
+        'email_not_confirmed' => 'Non Confirmed',
 		'city' => 'City',
 		'country' => 'Country',
 		'createdAt' => 'Created At',
diff --git a/ci4/app/Language/es/Users.php b/ci4/app/Language/es/Users.php
index 533cecf3..9ab94428 100644
--- a/ci4/app/Language/es/Users.php
+++ b/ci4/app/Language/es/Users.php
@@ -5,6 +5,11 @@
 return [
 		'address' => 'Dirección',
 		'blocked' => 'Bloqueado',
+        'non_blocked' => 'No bloqueado',
+        'global_active' => 'Activo',
+        'global_inactive' => 'Inactivo',
+        'email_confirmed' => 'Confirmado',
+        'email_not_confirmed' => 'No Confirmado',
 		'city' => 'Ciudad',
 		'country' => 'País',
 		'createdAt' => 'Creado en',
@@ -33,7 +38,7 @@ return [
 		'userList' => 'Lista de usuarios',
 		'users' => 'Usuarios',
 		'zipCode' => 'Código postal',
-		'validation' =>  [
+        'validation' =>  [
 			'address' =>  [
 				'max_length' => 'El campo {field} no puede exceder {param} caracteres en longitud.',
 
diff --git a/ci4/app/Views/themes/backend/vuexy/form/configuracion/paises/viewPaisForm.php b/ci4/app/Views/themes/backend/vuexy/form/configuracion/paises/viewPaisForm.php
index d5ebbd04..b310a533 100644
--- a/ci4/app/Views/themes/backend/vuexy/form/configuracion/paises/viewPaisForm.php
+++ b/ci4/app/Views/themes/backend/vuexy/form/configuracion/paises/viewPaisForm.php
@@ -8,17 +8,20 @@
 			<div class="card-header">
         		<h3 class="card-title"><?= $boxTitle ?? $pageTitle ?></h3>
 			</div><!--//.card-header -->
-			<form id="paisForm" method="post" action="<?= $formAction ?>">
+			<form id="paisForm" method="post" class="card-body" action="<?= $formAction ?>">
 				<?= csrf_field() ?>
-			<div class="card-body">
 				<?= view("themes/_commonPartialsBs/_alertBoxes") ?>
 				<?= !empty($validation->getErrors()) ? $validation->listErrors("bootstrap_style") : "" ?>
 				<?= view("themes/backend/focus2/form/configuracion/paises/_paisFormItems") ?>
-			</div><!-- /.card-body -->
-			<div class="card-footer">
-				<?= anchor(route_to("paisList"), lang("Basic.global.Cancel"), ["class" => "btn btn-secondary float-start"]) ?>
-				<input type="submit" class="btn btn-primary float-end" name="save" value="<?= lang("Basic.global.Save") ?>">
-			</div><!-- /.card-footer -->
+                <div class="pt-4">
+                    <input
+                            type="submit"
+                            class="btn btn-primary float-start me-sm-3 me-1"
+                            name="save"
+                            value="<?= lang("Basic.global.Save") ?>"
+                    />
+                    <?= anchor(route_to("paisList"), lang("Basic.global.Cancel"), ["class" => "btn btn-secondary float-start"]) ?>
+                </div><!-- /.card-footer -->
 			</form>
     </div><!-- //.card -->
     </div><!--//.col -->
diff --git a/ci4/app/Views/themes/backend/vuexy/form/configuracion/paises/viewPaisList.php b/ci4/app/Views/themes/backend/vuexy/form/configuracion/paises/viewPaisList.php
index 5d3e41a5..36fe58eb 100644
--- a/ci4/app/Views/themes/backend/vuexy/form/configuracion/paises/viewPaisList.php
+++ b/ci4/app/Views/themes/backend/vuexy/form/configuracion/paises/viewPaisList.php
@@ -65,8 +65,8 @@
 
 								</td>
 								<td class="align-middle text-center text-nowrap">
-									<?=anchor(route_to('editPais', $item->id), lang('Basic.global.edit'), ['class'=>'btn btn-sm btn-warning btn-edit me-1',  'data-id'=>$item->id,]); ?> 
-									<?=anchor('#confirm2delete', lang('Basic.global.Delete'), ['class'=>'btn btn-sm btn-danger btn-delete ms-1', 'data-href'=>route_to('deletePais', $item->id), 'data-bs-toggle'=>'modal', 'data-bs-target'=>'#confirm2delete']); ?>
+									<?=anchor(route_to('editPais', $item->id), "<i class='ti ti-pencil ti-sm mx-2'></i>", ['class'=>'text-body',  'data-id'=>$item->id,]); ?>
+									<?=anchor('#confirm2delete', "<i class='ti ti-trash ti-sm mx-2'></i>", ['class'=>'text-body', 'data-href'=>route_to('deletePais', $item->id), 'data-bs-toggle'=>'modal', 'data-bs-target'=>'#confirm2delete']); ?>
 								</td>
 							</tr>
 
diff --git a/ci4/app/Views/themes/backend/vuexy/form/configuracion/papel/viewPapelGenericoForm.php b/ci4/app/Views/themes/backend/vuexy/form/configuracion/papel/viewPapelGenericoForm.php
index 0ee48784..55f3b3c6 100644
--- a/ci4/app/Views/themes/backend/vuexy/form/configuracion/papel/viewPapelGenericoForm.php
+++ b/ci4/app/Views/themes/backend/vuexy/form/configuracion/papel/viewPapelGenericoForm.php
@@ -9,16 +9,19 @@
 			<div class="card-header">
 				<h3 class="card-title"><?= $boxTitle ?? $pageTitle ?></h3>
 			</div><!--//.card-header -->
-			<form id="papelGenericoForm" method="post" action="<?= $formAction ?>">
+			<form id="papelGenericoForm" method="post" class="card-body" action="<?= $formAction ?>">
 				<?= csrf_field() ?>
-				<div class="card-body">
-					<?= view("themes/_commonPartialsBs/_alertBoxes") ?>
-					<?= !empty($validation->getErrors()) ? $validation->listErrors("bootstrap_style") : "" ?>
-					<?= view("themes/backend/vuexy/form/configuracion/papel/_papelGenericoFormItems") ?>
-				</div><!-- /.card-body -->
-				<div class="card-footer">
-					<?= anchor(route_to("papelGenericoList"), lang("Basic.global.Cancel"), ["class" => "btn btn-secondary float-start"]) ?>
-					<input type="submit" class="btn btn-primary float-end" name="save" value="<?= lang("Basic.global.Save") ?>">
+                <?= view("themes/_commonPartialsBs/_alertBoxes") ?>
+                <?= !empty($validation->getErrors()) ? $validation->listErrors("bootstrap_style") : "" ?>
+                <?= view("themes/backend/vuexy/form/configuracion/papel/_papelGenericoFormItems") ?>
+				<div class="pt-4">
+                    <input
+                            type="submit"
+                            class="btn btn-primary float-start me-sm-3 me-1"
+                            name="save"
+                            value="<?= lang("Basic.global.Save") ?>"
+                    />
+					<?= anchor(route_to("papelGenericoList"), lang("Basic.global.Cancel"), ["class" => "btn btn-secondary"]) ?>
 				</div><!-- /.card-footer -->
 
 			</form>
diff --git a/ci4/app/Views/themes/backend/vuexy/form/configuracion/papel/viewPapelImpresionForm.php b/ci4/app/Views/themes/backend/vuexy/form/configuracion/papel/viewPapelImpresionForm.php
index e21b318f..c5b03a9c 100644
--- a/ci4/app/Views/themes/backend/vuexy/form/configuracion/papel/viewPapelImpresionForm.php
+++ b/ci4/app/Views/themes/backend/vuexy/form/configuracion/papel/viewPapelImpresionForm.php
@@ -8,17 +8,20 @@
 			<div class="card-header">
         		<h3 class="card-title"><?= $boxTitle ?? $pageTitle ?></h3>
 			</div><!--//.card-header -->
-			<form id="papelImpresionForm" method="post" action="<?= $formAction ?>">
+			<form id="papelImpresionForm" method="post" class="card-body" action="<?= $formAction ?>">
 				<?= csrf_field() ?>
-			<div class="card-body">
 				<?= view("themes/_commonPartialsBs/_alertBoxes") ?>
 				<?= !empty($validation->getErrors()) ? $validation->listErrors("bootstrap_style") : "" ?>
 				<?= view("themes/backend/vuexy/form/configuracion/papel/_papelImpresionFormItems") ?>
-			</div><!-- /.card-body -->
-			<div class="card-footer">
-				<?= anchor(route_to("papelImpresionList"), lang("Basic.global.Cancel"), ["class" => "btn btn-secondary float-start"]) ?>
-				<input type="submit" class="btn btn-primary float-end" name="save" value="<?= lang("Basic.global.Save") ?>">
-			</div><!-- /.card-footer -->
+                <div class="pt-4">
+                    <input
+                            type="submit"
+                            class="btn btn-primary float-start me-sm-3 me-1"
+                            name="save"
+                            value="<?= lang("Basic.global.Save") ?>"
+                    />
+                    <?= anchor(route_to("papelImpresionList"), lang("Basic.global.Cancel"), ["class" => "btn btn-secondary"]) ?>
+                </div><!-- /.card-footer -->
 			</form>
     </div><!-- //.card -->
     </div><!--//.col -->
diff --git a/ci4/app/Views/themes/backend/vuexy/form/user/_userFormItems.php b/ci4/app/Views/themes/backend/vuexy/form/user/_userFormItems.php
index af23de5e..fc34397d 100644
--- a/ci4/app/Views/themes/backend/vuexy/form/user/_userFormItems.php
+++ b/ci4/app/Views/themes/backend/vuexy/form/user/_userFormItems.php
@@ -137,8 +137,8 @@
 					</label>
 						<?php $id_select = old('blocked', $user->blocked);?>
 						<select name="blocked" id="blocked" class="select2 form-control">
-							<option value="0" <?= $id_select == "0" ? 'selected' : '' ?>><?=lang("User.user_non_blocked")?></option>
-							<option value="1" <?= $id_select == "1" ? 'selected' : '' ?>><?=lang("User.user_blocked")?></option>
+							<option value="0" <?= $id_select == "0" ? 'selected' : '' ?>><?=lang("Users.non_blocked")?></option>
+							<option value="1" <?= $id_select == "1" ? 'selected' : '' ?>><?=lang("Users.blocked")?></option>
 						</select>
 				</div>
 
@@ -148,8 +148,8 @@
 					</label>
 					<?php $id_select = old('email_confirmed', $user->email_confirmed);?>
 					<select name="email_confirmed" id="email_confirmed" class="select2 form-control">
-						<option value="0" <?= $id_select == "0" ? 'selected' : '' ?>><?=lang("User.user_alert_not_confirmed")?></option>
-						<option value="1" <?= $id_select == "1" ? 'selected' : '' ?>><?=lang("User.user_alert_confirmed")?></option>
+						<option value="0" <?= $id_select == "0" ? 'selected' : '' ?>><?=lang("Users.email_not_confirmed")?></option>
+						<option value="1" <?= $id_select == "1" ? 'selected' : '' ?>><?=lang("Users.email_confirmed")?></option>
 					</select>
 
 				</div>
@@ -161,14 +161,12 @@
 					</label>
 					<?php $id_select = old('status', $user->status);?>
 					<select name="status" id="status" class="select2 form-control">
-						<option value="1" <?= $id_select == "1" ? 'selected' : '' ?>><?=lang("User.global_active")?></option>
-						<option value="0" <?= $id_select == "0" ? 'selected' : '' ?>><?=lang("User.global_inactive")?></option>
+						<option value="1" <?= $id_select == "1" ? 'selected' : '' ?>><?=lang("Users.global_active")?></option>
+						<option value="0" <?= $id_select == "0" ? 'selected' : '' ?>><?=lang("Users.global_inactive")?></option>
 					</select>
 
 				</div><!--//.mb-3 -->
 
-
-
             </div><!--//.col -->    
 
         </div><!-- //.row -->
\ No newline at end of file