diff --git a/indra/newview/skins/default/xui/it/floater_emoji_picker.xml b/indra/newview/skins/default/xui/it/floater_emoji_picker.xml
new file mode 100644
index 0000000000..e16b383095
--- /dev/null
+++ b/indra/newview/skins/default/xui/it/floater_emoji_picker.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater name="emojipicker" title="Scegli Emoji">
+	<floater.string name="title_for_recently_used" value="Usate di recente"/>
+	<floater.string name="title_for_frequently_used" value="Usate di frequente"/>
+	<text name="Dummy">
+		Nessuna emoji selezionata
+	</text>
+</floater>
diff --git a/indra/newview/skins/default/xui/it/floater_fs_im_session.xml b/indra/newview/skins/default/xui/it/floater_fs_im_session.xml
index f77461a1f7..0e11ff3ae2 100644
--- a/indra/newview/skins/default/xui/it/floater_fs_im_session.xml
+++ b/indra/newview/skins/default/xui/it/floater_fs_im_session.xml
@@ -62,9 +62,18 @@
 				</layout_panel>
 				<layout_panel name="chat_layout_panel">
 					<layout_stack name="input_panels">
+						<layout_panel name="emoji_button_layout_panel">
+							<button name="emoji_picker_toggle_btn" tool_tip="Mostra pannello emoji" />
+							<button name="emoji_recent_panel_toggle_btn" tool_tip="Mostra/nascondi emoji recenti" />
+						</layout_panel>
 						<layout_panel name="input_button_layout_panel">
 							<button name="send_chat" label="Invia" tool_tip="Invia un messaggio IM" />
 						</layout_panel>
+						<layout_panel name="emoji_recent_layout_panel">
+							<text name="emoji_recent_empty_text">
+								Le emoji usate di recente verranno visualizzate qui
+							</text>
+						</layout_panel>
 					</layout_stack>
 				</layout_panel>
 			</layout_stack>
diff --git a/indra/newview/skins/default/xui/it/floater_fs_nearby_chat.xml b/indra/newview/skins/default/xui/it/floater_fs_nearby_chat.xml
index a45de16bdf..b1a94725ce 100644
--- a/indra/newview/skins/default/xui/it/floater_fs_nearby_chat.xml
+++ b/indra/newview/skins/default/xui/it/floater_fs_nearby_chat.xml
@@ -27,6 +27,10 @@
 				</layout_panel>
 				<layout_panel name="chat_layout_panel">
 					<layout_stack name="input_panels">
+						<layout_panel name="emoji_button_layout_panel">
+							<button name="emoji_picker_toggle_btn" tool_tip="Mostra pannello emoji" />
+							<button name="emoji_recent_panel_toggle_btn" tool_tip="Mostra/nascondi emoji recenti" />
+						</layout_panel>
 						<layout_panel name="input_button_layout_panel">
 							<spinner name="ChatChannel" tool_tip="Canale a cui inviare i messaggi. Abilitare in Preferenze -> Chat -> Scrittura -> Selezione canale nella barra chat"/>
 						</layout_panel>
@@ -40,6 +44,11 @@
 						</layout_panel>
 					</layout_stack>
 				</layout_panel>
+				<layout_panel name="emoji_recent_layout_panel">
+					<text name="emoji_recent_empty_text">
+						Le emoji usate di recente verranno visualizzate qui
+					</text>
+				</layout_panel>
 			</layout_stack>
 		</layout_panel>
 	</layout_stack>
diff --git a/indra/newview/skins/default/xui/it/floater_im_session.xml b/indra/newview/skins/default/xui/it/floater_im_session.xml
index d8ccb99203..56a74e6c9a 100644
--- a/indra/newview/skins/default/xui/it/floater_im_session.xml
+++ b/indra/newview/skins/default/xui/it/floater_im_session.xml
@@ -21,11 +21,19 @@
 			</layout_panel>
 			<layout_panel name="chat_layout_panel">
 				<layout_stack name="input_panels">
+					<layout_panel name="input_editor_layout_panel">
+						<button name="emoji_recent_panel_toggle_btn" tool_tip="Mostra/nascondi emoji recenti" />
+					</layout_panel>
 					<layout_panel name="input_button_layout_panel">
 						<button name="minz_btn" tool_tip="Mostra/nascondi pannello messaggi"/>
 					</layout_panel>
 				</layout_stack>
 			</layout_panel>
+			<layout_panel name="emoji_recent_layout_panel">
+				<text name="emoji_recent_empty_text">
+					Le emoji usate di recente verranno visualizzate qui
+				</text>
+			</layout_panel>
 		</layout_stack>
 	</view>
 </floater>
diff --git a/indra/newview/skins/default/xui/it/menu_fs_chat_options.xml b/indra/newview/skins/default/xui/it/menu_fs_chat_options.xml
index 9faf966408..32f21b08cc 100644
--- a/indra/newview/skins/default/xui/it/menu_fs_chat_options.xml
+++ b/indra/newview/skins/default/xui/it/menu_fs_chat_options.xml
@@ -15,6 +15,7 @@
 	<menu_item_check label="Mostra notifiche per i nuovi messaggi" name="new_message_notification" />
 	<menu_item_check label="Mostra la barra della chat" name="show_chat_bar" />
 	<menu_item_check label="Mostra Seleziona Canale" name="show_channel_selection" />
+	<menu_item_check label="Mostra il pulsante Emoji" name="show_emoji_button" />
 	<menu_item_check label="Mostra tipo di Chat / pulsante Invio" name="show_send_button" />
 	<menu_item_check label="Mostra il pulsante Invio nelle sessioni IM" name="show_im_send_button" />
 </toggleable_menu>
diff --git a/indra/newview/skins/default/xui/it/menu_login.xml b/indra/newview/skins/default/xui/it/menu_login.xml
index 7cf7a386f6..90df9e75a6 100644
--- a/indra/newview/skins/default/xui/it/menu_login.xml
+++ b/indra/newview/skins/default/xui/it/menu_login.xml
@@ -25,6 +25,11 @@
 	<menu label="Debug" name="Debug">
 		<menu_item_call label="Impostazioni di debug" name="Debug Settings"/>
 		<menu_item_call label="Strumento anteprima XUI" name="UI Preview Tool"/>
+		<menu label="Caratteri" name="Fonts">
+			<menu_item_call label="Mostra test carattere" name="Show Font Test" />
+			<menu_item_call label="Scarica caratteri" name="Dump Fonts" />
+			<menu_item_call label="Scarica texture dei caratteri" name="Dump Font Textures" />
+		</menu>
 		<menu label="Test interfaccia utente" name="UI Tests"/>
 		<menu_item_call label="Imposta dimensioni della finestra..." name="Set Window Size..."/>
 		<menu_item_call label="Mostra i Termini del servizio (TOS)" name="TOS"/>
diff --git a/indra/newview/skins/default/xui/it/menu_viewer.xml b/indra/newview/skins/default/xui/it/menu_viewer.xml
index c6bc732506..49459152e6 100644
--- a/indra/newview/skins/default/xui/it/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/it/menu_viewer.xml
@@ -542,25 +542,28 @@
 			<menu_item_call label="Scarica Simulator Features to Nearby Chat" name="DumpSimFeaturesToChat"/>
 		</menu>
 		<menu label="UI" name="UI">
-			<menu_item_call label="Test Media browser" name="Web Browser Test"/>
-			<menu_item_check label="Test riavvio regione..." name="Region Restart Test"/>
-			<menu_item_call label="Web Content Browser" name="Web Content Browser"/>
+			<menu_item_call label="Test browser multimediale" name="Web Browser Test"/>
+			<menu_item_check label="Test riavvio regione" name="Region Restart Test"/>
+			<menu_item_call label="Browser contenuti web" name="Web Content Browser"/>
+			<menu_item_call label="Scarica caratteri" name="Dump Fonts" />
+			<menu_item_call label="Scarica texture dei caratteri" name="Dump Font Textures" />
 			<menu_item_call label="Test connessione FB" name="FB Connect Test"/>
 			<menu_item_call label="Scarica SelectMgr" name="Dump SelectMgr"/>
-			<menu_item_call label="Scarica Inventario" name="Dump Inventory"/>
-			<menu_item_call label="Scarica Timers" name="Dump Timers"/>
-			<menu_item_call label="Scarica Focus Holder" name="Dump Focus Holder"/>
+			<menu_item_call label="Scarica inventario" name="Dump Inventory"/>
+			<menu_item_call label="Scarica timers" name="Dump Timers"/>
+			<menu_item_call label="Scarica punto focale" name="Dump Focus Holder"/>
 			<menu_item_call label="Stampa info oggetto selezionato" name="Print Selected Object Info"/>
 			<menu_item_call label="Stampa info agente" name="Print Agent Info"/>
 			<menu_item_check label="Doppio clic Auto-Pilota" name="Double-ClickAuto-Pilot"/>
 			<menu_item_check label="Doppio clic Teleport" name="DoubleClick Teleport"/>
 			<menu_item_check label="Debug SelectMgr" name="Debug SelectMgr"/>
 			<menu_item_check label="Debug clic" name="Debug Clicks"/>
-			<menu_item_check label="Debug viste" name="Debug Views"/>
-			<menu_item_check label="Debug Name Tooltips" name="Debug Name Tooltips"/>
+			<menu_item_check label="Debug visualizzazione" name="Debug Views"/>
+			<menu_item_check label="Debug Unicode" name="Debug Unicode" />
+			<menu_item_check label="Debug suggerimenti sul nome" name="Debug Name Tooltips"/>
 			<menu_item_check label="Debug eventi mouse" name="Debug Mouse Events"/>
 			<menu_item_check label="Debug tasti" name="Debug Keys"/>
-			<menu_item_check label="Debug Window Process" name="Debug WindowProc"/>
+			<menu_item_check label="Debug processi finestra" name="Debug WindowProc"/>
 		</menu>
 		<menu label="XUI" name="XUI">
 			<menu_item_call label="Ricarica impostazioni colori" name="Reload Color Settings"/>