diff --git a/WWW-YoutubeViewer/MANIFEST b/WWW-YoutubeViewer/MANIFEST
index 522d0c14..12979a97 100644
--- a/WWW-YoutubeViewer/MANIFEST
+++ b/WWW-YoutubeViewer/MANIFEST
@@ -15,14 +15,14 @@ MANIFEST			This list of files
 META.json
 META.yml
 README
-share/gtk-youtube-viewer-icons/default_thumb.jpg
-share/gtk-youtube-viewer-icons/feed_icon.png
-share/gtk-youtube-viewer-icons/gtk-youtube-viewer.png
-share/gtk-youtube-viewer-icons/spinner.gif
-share/gtk-youtube-viewer-icons/user.png
 share/gtk-youtube-viewer.desktop
 share/gtk-youtube-viewer.glade
+share/gtk-youtube-viewer.png
+share/icons/default_thumb.jpg
+share/icons/feed_icon.png
 share/icons/gtk-youtube-viewer.png
+share/icons/spinner.gif
+share/icons/user.png
 t/00-load.t
 t/pod-coverage.t
 t/pod.t
diff --git a/WWW-YoutubeViewer/README b/WWW-YoutubeViewer/README
index 9af4be68..f9407b26 100644
--- a/WWW-YoutubeViewer/README
+++ b/WWW-YoutubeViewer/README
@@ -13,7 +13,7 @@ PACKAGING
 
 To package this application, run the following commands:
 
-    perl Build.PL --destdir "/my/package/path"
+    perl Build.PL --destdir "/my/package/path" --installdirs vendor
     ./Build
     ./Build test
     ./Build install --install_path script=/usr/bin
@@ -24,7 +24,7 @@ To install GTK Youtube Viewer, run Build.PL with the '--gtk-youtube-viewer' argu
 
     perl Build.PL --gtk-youtube-viewer
 or:
-    perl Build.PL --destdir "/my/path" --gtk-youtube-viewer
+    perl Build.PL --destdir "/my/path" --installdirs vendor --gtk-youtube-viewer
 
 
 SUPPORT AND DOCUMENTATION
diff --git a/WWW-YoutubeViewer/bin/gtk-youtube-viewer b/WWW-YoutubeViewer/bin/gtk-youtube-viewer
index 52d4b561..a4f1981d 100755
--- a/WWW-YoutubeViewer/bin/gtk-youtube-viewer
+++ b/WWW-YoutubeViewer/bin/gtk-youtube-viewer
@@ -219,7 +219,7 @@ foreach my $sig (qw(HUP TERM INT KILL)) {
 
 # Locating the .glade interface file and icons dir
 my $glade_file = catfile($share_dir, "$execname.glade");
-my $icons_path = catdir($share_dir, "$execname-icons");
+my $icons_path = catdir($share_dir, 'icons');
 
 # Defining GUI
 my $gui = 'Gtk2::Builder'->new;
diff --git a/WWW-YoutubeViewer/share/gtk-youtube-viewer-icons/gtk-youtube-viewer.png b/WWW-YoutubeViewer/share/gtk-youtube-viewer-icons/gtk-youtube-viewer.png
deleted file mode 100644
index 1936c10d..00000000
Binary files a/WWW-YoutubeViewer/share/gtk-youtube-viewer-icons/gtk-youtube-viewer.png and /dev/null differ
diff --git a/WWW-YoutubeViewer/share/gtk-youtube-viewer.png b/WWW-YoutubeViewer/share/gtk-youtube-viewer.png
new file mode 100644
index 00000000..d442bb81
Binary files /dev/null and b/WWW-YoutubeViewer/share/gtk-youtube-viewer.png differ
diff --git a/WWW-YoutubeViewer/share/gtk-youtube-viewer-icons/default_thumb.jpg b/WWW-YoutubeViewer/share/icons/default_thumb.jpg
similarity index 100%
rename from WWW-YoutubeViewer/share/gtk-youtube-viewer-icons/default_thumb.jpg
rename to WWW-YoutubeViewer/share/icons/default_thumb.jpg
diff --git a/WWW-YoutubeViewer/share/gtk-youtube-viewer-icons/feed_icon.png b/WWW-YoutubeViewer/share/icons/feed_icon.png
similarity index 100%
rename from WWW-YoutubeViewer/share/gtk-youtube-viewer-icons/feed_icon.png
rename to WWW-YoutubeViewer/share/icons/feed_icon.png
diff --git a/WWW-YoutubeViewer/share/icons/gtk-youtube-viewer.png b/WWW-YoutubeViewer/share/icons/gtk-youtube-viewer.png
index d442bb81..1936c10d 100644
Binary files a/WWW-YoutubeViewer/share/icons/gtk-youtube-viewer.png and b/WWW-YoutubeViewer/share/icons/gtk-youtube-viewer.png differ
diff --git a/WWW-YoutubeViewer/share/gtk-youtube-viewer-icons/spinner.gif b/WWW-YoutubeViewer/share/icons/spinner.gif
similarity index 100%
rename from WWW-YoutubeViewer/share/gtk-youtube-viewer-icons/spinner.gif
rename to WWW-YoutubeViewer/share/icons/spinner.gif
diff --git a/WWW-YoutubeViewer/share/gtk-youtube-viewer-icons/user.png b/WWW-YoutubeViewer/share/icons/user.png
similarity index 100%
rename from WWW-YoutubeViewer/share/gtk-youtube-viewer-icons/user.png
rename to WWW-YoutubeViewer/share/icons/user.png