diff --git a/src/gtk/actions.c b/src/gtk/actions.c
index 4dd8447..727578c 100644
--- a/src/gtk/actions.c
+++ b/src/gtk/actions.c
@@ -76,12 +76,23 @@ static void copy_action(GtkAction *action, GtkWidget *widget)
 	v3270_copy_clipboard(GTK_V3270(widget));
 }
 
-static void paste_action(GtkAction *action, GtkWidget *widget)
+static void paste_clipboard_action(GtkAction *action, GtkWidget *widget)
 {
 	trace("Action %s activated on widget %p",gtk_action_get_name(action),widget);
 	v3270_paste_clipboard(GTK_V3270(widget));
 }
 
+static void paste_next_action(GtkAction *action, GtkWidget *widget)
+{
+	trace("Action %s activated on widget %p",gtk_action_get_name(action),widget);
+	lib3270_pastenext(GTK_V3270(widget)->host);
+}
+
+static void paste_file_action(GtkAction *action, GtkWidget *widget)
+{
+	trace("Action %s activated on widget %p",gtk_action_get_name(action),widget);
+}
+
 static void connect_standard_action(GtkAction *action, GtkWidget *widget, const gchar *name)
 {
 	#undef DECLARE_LIB3270_ACTION
@@ -117,7 +128,6 @@ static void connect_standard_action(GtkAction *action, GtkWidget *widget, const 
 		{ "connect", 	connect_action		},
 		{ "copy", 		copy_action			},
 		{ "disconnect", disconnect_action	},
-		{ "paste", 		paste_action		},
 	};
 
 	int f;
@@ -229,6 +239,21 @@ static void action_reset_toggle(GtkAction *action, GtkWidget *widget)
 	lib3270_set_toggle(GTK_V3270(widget)->host,id,0);
 }
 
+static int id_from_array(const gchar *key, const gchar **array, GError **error)
+{
+	int f;
+
+	for(f = 0;array[f];f++)
+	{
+		if(!g_strcasecmp(key,array[f]))
+			return f;
+	}
+
+	*error = g_error_new(ERROR_DOMAIN,EINVAL, _("Unexpected or invalid attribute value \"%s\""), key );
+
+	return -1;
+}
+
 GtkAction * ui_get_action(GtkWidget *widget, const gchar *name, GHashTable *hash, const gchar **names, const gchar **values, GError **error)
 {
 	static const gchar *actionname[ACTION_COUNT] = {	"pastenext",
@@ -240,6 +265,7 @@ GtkAction * ui_get_action(GtkWidget *widget, const gchar *name, GHashTable *hash
 	GtkAction 		**toggle_action	= (GtkAction **) g_object_get_data(G_OBJECT(widget),"toggle_actions");
 	const gchar		* direction		= ui_get_attribute("direction",names,values);
 	unsigned short	  flags			= 0;
+	const GCallback * callback		= NULL;
 	const gchar		* attr;
 	int				  id			= 0;
 	gchar			* nm			= NULL;
@@ -254,6 +280,7 @@ GtkAction * ui_get_action(GtkWidget *widget, const gchar *name, GHashTable *hash
 		ACTION_TYPE_PAKEY,
 		ACTION_TYPE_SET,
 		ACTION_TYPE_RESET,
+		ACTION_TYPE_TABLE,
 
 	} action_type = ACTION_TYPE_DEFAULT;
 
@@ -302,6 +329,37 @@ GtkAction * ui_get_action(GtkWidget *widget, const gchar *name, GHashTable *hash
 		nm = g_strconcat((flags & 0x80) ? "select" : "move",attr,direction, NULL);
 
 	}
+	else if(!g_strcasecmp(name,"paste"))
+	{
+		action_type	= ACTION_TYPE_TABLE;
+		attr		= ui_get_attribute("src",names,values);
+
+		if(!attr)
+		{
+			*error = g_error_new(ERROR_DOMAIN,EINVAL,"%s",_("Paste action needs src attribute" ));
+			return NULL;
+		}
+		else
+		{
+			static const GCallback cbk[] = {	G_CALLBACK(paste_clipboard_action),
+												G_CALLBACK(paste_next_action),
+												G_CALLBACK(paste_file_action)
+											};
+			static const gchar 		* src[] = { "clipboard",
+												"next",
+												"file",
+												NULL
+												};
+			id = id_from_array(attr,src,error);
+			if(id < 0)
+				return NULL;
+
+			callback = cbk;
+		}
+
+		nm = g_strconcat(name,attr, NULL);
+
+	}
 	else if(!g_strcasecmp(name,"set"))
 	{
 		action_type	= ACTION_TYPE_SET;
@@ -407,6 +465,11 @@ GtkAction * ui_get_action(GtkWidget *widget, const gchar *name, GHashTable *hash
 		g_object_set_data(G_OBJECT(action),"toggle_id",(gpointer) id);
 		g_signal_connect(action,"activate",G_CALLBACK(action_reset_toggle),widget);
 		break;
+
+	case ACTION_TYPE_TABLE:
+		action = gtk_action_new(nm,NULL,NULL,NULL);
+		g_signal_connect(action,"activate",callback[id],widget);
+		break;
 	}
 
 	for(f=0;f<ACTION_COUNT;f++)
diff --git a/ui/00default.xml b/ui/00default.xml
index 71565f2..0401888 100644
--- a/ui/00default.xml
+++ b/ui/00default.xml
@@ -33,13 +33,13 @@
 	<menubar name='topmenu' topmenu='yes'>
 
 		<menu name='FileMenu' label='_File' >
-			<menuitem action='SaveScreen' group='online' label='Save screen' />
-			<menuitem action='SaveSelected' group='selection' label='Save selected' />
-			<menuitem action='SaveClipboard' group='clipboard' label='Save copy' />
+			<menuitem action='save' src='all' group='online' label='Save screen' />
+			<menuitem action='save' src='selected' group='selection' label='Save selected' />
+			<menuitem action='save' src='copy' group='clipboard' label='Save copy' />
 			<separator/>
-			<menuitem action='PrintScreen' key='Print' icon='print' group='online' label='Print' />
-			<menuitem action='PrintSelected' group='selection' label='Print selected' />
-			<menuitem action='PrintClipboard' group='clipboard' label='Print copy' />
+			<menuitem action='print' src='all' key='Print' icon='print' group='online' label='Print' />
+			<menuitem action='print' src='selected' group='selection' label='Print selected' />
+			<menuitem action='print' src='copy' group='clipboard' label='Print copy' />
 			<separator/>
 			<menu name='FTMenu' group='filetransfer' label='Send/Receive' >
 				<menuitem action='Download' key='<alt>d' group='filetransfer' label='Receive file' />
@@ -53,9 +53,9 @@
 			<menuitem action='CopyAsTable' key='<ctrl><alt>c' group='selection' label='Copy as table' />
 			<menuitem action='CopyAsImage' group='selection' label='Copy as image' />
 			<menuitem action='Append' key='<shift><ctrl>c' group='selection' label='Add to copy' />
-			<menuitem action='Paste' key='<ctrl>v' icon='paste' group='paste' label='Paste' />
-			<menuitem action='PasteNext' key='<shift><ctrl>v' label='Paste next' />
-			<menuitem action='PasteTextFile' group='online' label='Paste text file' />
+			<menuitem action='paste' src='clipboard' key='<ctrl>v' icon='paste' group='paste' label='Paste' />
+			<menuitem action='paste' src='next' key='<shift><ctrl>v' label='Paste next' />
+			<menuitem action='paste' src='file' group='online' label='Paste text file' />
 
 			<separator/>
 			<menuitem action='selectall' key='<ctrl>a' icon='select-all' group='online' label='Select all' />
@@ -125,7 +125,7 @@
 	<toolbar name='toolbar.default' label='Toolbar' key='<alt>t' >
 		<toolitem action='selectall' />
 		<toolitem action='Copy' />
-		<toolitem action='Paste' />
+		<toolitem action='paste' src='clipboard' />
 		<toolitem action='EraseInput' />
 
 		<separator/>
@@ -136,7 +136,7 @@
 		<toolitem action='set' toggle='fullscreen' icon='fullscreen' label='Full Screen' />
 		<toolitem action='reset' toggle='fullscreen' icon='leave-fullscreen' label='Window' />
 		<toolitem action='SelectColors' />
-		<toolitem action='PrintScreen' />
+		<toolitem action='print' src='all' />
 		<toolitem action='Quit' />
 	</toolbar>
 
@@ -147,20 +147,20 @@
 		<menuitem action='selectall'/>
 
 		<separator />
-		<menuitem action='PrintScreen'/>
-		<menuitem action='PrintSelected'/>
-		<menuitem action='PrintClipboard'/>
+		<menuitem action='print' src='all'/>
+		<menuitem action='print' src='selected'/>
+		<menuitem action='print' src='copy'/>
 
 		<separator />
 		<menuitem action='Quit'/>
 	</popup>
 
 	<popup name='defaultpopup' type='default'>
-		<menuitem action='Paste'/>
-		<menuitem action='PasteNext'/>
+		<menuitem action='paste' src='clipboard'/>
+		<menuitem action='paste' src='next'/>
 		<menuitem action='selectall'/>
-		<menuitem action='PrintScreen'/>
-		<menuitem action='PrintClipboard'/>
+		<menuitem action='print' src='all'/>
+		<menuitem action='print' src='copy'/>
 
 		<separator />
 		<menuitem action='backtab' label='Previous field' />
--
libgit2 0.21.2