3 files changed, 17 insertions, 10 deletions
diff --git a/data/art/Makefile.am b/data/art/Makefile.am
index 302d5eb3b..ca2595c24 100644
--- a/data/art/Makefile.am
+++ b/data/art/Makefile.am
@@ -3,6 +3,9 @@ art_DATA = \
 	epiphany-unsecure.png	\
 	epiphany.png
 
+appicon_DATA = epiphany.png
+appicondir = $(datadir)/pixmaps
+
 artdir = $(pkgdatadir)/art
 
-EXTRA_DIST = $(art_DATA)
+EXTRA_DIST = $(appicon_DATA) $(art_DATA)
diff --git a/data/epiphany.desktop.in b/data/epiphany.desktop.in
index cf28231d5..80c80feb5 100644
--- a/data/epiphany.desktop.in
+++ b/data/epiphany.desktop.in
@@ -4,6 +4,6 @@ _Comment=Browse the web
 Exec=epiphany
 Terminal=0
 Type=Application
-Icon=
+Icon=epiphany.png
 X-GNOME-DocPath=
 Categories=Application;Network;
diff --git a/data/ui/epiphany-ui.xml.in b/data/ui/epiphany-ui.xml.in
index cb966a4e4..0927957a5 100644
--- a/data/ui/epiphany-ui.xml.in
+++ b/data/ui/epiphany-ui.xml.in
@@ -79,6 +79,8 @@
 	
 	<cmd name="GoGo" _label="_Go"
 	     _tip="Load the URL in the location entry"/>
+	
+	<cmd name="EPOpenLink" _label="Open"/>
 
 	<cmd name="EPOpenInNewWindow" _label="Open in New Window"/>
 	
@@ -375,22 +377,24 @@
 	
 	<popup name="EphyEmbedElementPopup">
 		<placeholder name="LinkItems">
-        		<menuitem name="EPOpenInNewWindow" 
+        		<menuitem name="EPOpenLink" 
 			 pixtype="stock" pixname="gtk-open"
 			 verb=""/>
 
-			<menuitem name="EPOpenInNewTab" verb=""/>
-			
-			<menuitem name="EPCopyLinkLocation" 
-			 pixtype="stock" pixname="gtk-copy"	
-			 verb=""/>
+        		<menuitem name="EPOpenInNewWindow" verb=""/>
 
+			<menuitem name="EPOpenInNewTab" verb=""/>
+	
 			<menuitem name="EPDownloadLink" verb=""/>
-
+			
 			<menuitem name="EPAddBookmark" 
 			 pixtype="stock" pixname="gtk-add"
 			 verb=""/>
-		</placeholder>
+
+			<menuitem name="EPCopyLinkLocation" 
+			 pixtype="stock" pixname="gtk-copy"	
+			 verb=""/>
+			</placeholder>
 		<placeholder name="EmailLinkItems">
 			<menuitem name="EPCopyEmail" 
 			 pixtype="stock" pixname="gtk-copy"