diff --git a/.SRCINFO b/.SRCINFO
index 1c8ba13..fd4b988 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -33,9 +33,11 @@ pkgbase = google-chrome
 	source = google-chrome-stable_53.0.2785.143_amd64.deb::https://dl.google.com/linux/direct/google-chrome-stable_current_amd64.deb
 	source = https://www.google.com/chrome/browser/privacy/eula_text.html
 	source = google-chrome-stable.sh
+	source = StartupWMClass_and_GNOME3-context-menu.patch
 	md5sums = 8e29b422e075ddb36a7d0c54264c11ab
 	md5sums = SKIP
 	md5sums = 99fa93d5e7fb5d622cef0f9621f3ffa3
+	md5sums = c28d84561b994b8a0aeae3d6e12265c4
 
 pkgname = google-chrome
 
diff --git a/PKGBUILD b/PKGBUILD
index 5ba4b5d..114dc58 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -22,10 +22,12 @@ install=$pkgname.install
 _channel=stable
 source=("google-chrome-${_channel}_${pkgver}_amd64.deb::https://dl.google.com/linux/direct/google-chrome-${_channel}_current_amd64.deb"
         "$url/browser/privacy/eula_text.html"
-        'google-chrome-stable.sh')
+        'google-chrome-stable.sh'
+		'StartupWMClass_and_GNOME3-context-menu.patch')
 md5sums=('8e29b422e075ddb36a7d0c54264c11ab'
          'SKIP'
-         '99fa93d5e7fb5d622cef0f9621f3ffa3')
+         '99fa93d5e7fb5d622cef0f9621f3ffa3'
+		 'c28d84561b994b8a0aeae3d6e12265c4')
 
 package() {
   msg2 "Extracting the data.tar.xz..."
@@ -47,13 +49,14 @@ package() {
   # License
   install -Dm644 eula_text.html "$pkgdir"/usr/share/licenses/google-chrome/eula_text.html
 
-  msg2 "Fixing Chrome icon resolution..."
-  sed -i "/Exec=/i\StartupWMClass=google-chrome" "$pkgdir"/usr/share/applications/google-chrome.desktop
+  #msg2 "Fixing Chrome icon resolution..."
+  #sed -i "/Exec=/i\StartupWMClass=google-chrome" "$pkgdir"/usr/share/applications/google-chrome.desktop
 
-  msg2 "Fixing permissions of documentation folder..."
-  chmod 755 "$pkgdir"/usr/share/doc/google-chrome-$_channel/
+  msg2 "Fixing Chrome icon resolution and GNOME 3 context menu..."
+  cd "$pkgdir"
+  patch -p0 -i "$srcdir"/StartupWMClass_and_GNOME3-context-menu.patch
 
-  msg2 "Removing unnecessities (e.g. Debian Cron job)..."
+  msg2 "Removing Debian Cron job and duplicate product logos..."
   rm -r "$pkgdir"/etc/cron.daily/ "$pkgdir"/opt/google/chrome/cron/
   rm "$pkgdir"/opt/google/chrome/product_logo_*.png
 }
diff --git a/StartupWMClass_and_GNOME3-context-menu.patch b/StartupWMClass_and_GNOME3-context-menu.patch
new file mode 100644
index 0000000..930ba7e
--- /dev/null
+++ b/StartupWMClass_and_GNOME3-context-menu.patch
@@ -0,0 +1,29 @@
+diff -ur usr/share/applications/google-chrome.desktop usr-patched/share/applications/google-chrome.desktop
+--- usr/share/applications/google-chrome.desktop	2016-09-25 06:31:36.000000000 +0300
++++ usr-patched/share/applications/google-chrome.desktop	2016-10-09 16:58:01.694853900 +0300
+@@ -105,6 +105,7 @@
+ Comment[zh_CN]=访问互联网
+ Comment[zh_HK]=連線到網際網路
+ Comment[zh_TW]=連線到網際網路
++StartupWMClass=google-chrome
+ Exec=/usr/bin/google-chrome-stable %U
+ Terminal=false
+ Icon=google-chrome
+@@ -112,6 +113,17 @@
+ Categories=Network;WebBrowser;
+ MimeType=text/html;text/xml;application/xhtml_xml;image/webp;x-scheme-handler/http;x-scheme-handler/https;x-scheme-handler/ftp;
+ X-Ayatana-Desktop-Shortcuts=NewWindow;NewIncognito
++Actions=new-window;new-private-window;
++
++[Desktop Action new-window]
++Name=New Window
++StartupWMClass=google-chrome
++Exec=/usr/bin/google-chrome-stable
++
++[Desktop Action new-private-window]
++Name=New Private Window
++StartupWMClass=google-chrome
++Exec=/usr/bin/google-chrome-stable --incognito
+ 
+ [NewWindow Shortcut Group]
+ Name=New Window