diff --git a/CHANGELOG.md b/CHANGELOG.md
index b8603cf..42e3ded 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -29,6 +29,8 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 - Mode names in mode icon specifications are now case-sensitive.
 - All mode names in mode icon specifications have changed to only
   match the complete name, not a partial name.
+- C, C++, C#, PHP and Java modes match a wider variety of modes.  See
+  (Issue #18).
 
 ### Removed
 
diff --git a/mode-icons.el b/mode-icons.el
index a368b64..6df9b2f 100644
--- a/mode-icons.el
+++ b/mode-icons.el
@@ -152,8 +152,7 @@ This was stole/modified from `c-save-buffer-state'"
     ("\\`Lisp\\'" "cl" xpm)
     ("\\`nXML\\'" "xml" xpm)
     ("\\`Org\\'" "org" xpm)
-    ("\\`PHP\\'" "php" xpm)
-    ("\\`PHP/l\\'" "php" xpm)
+    ("\\`PHP\\(\\|/.*\\)\\'" "php" xpm)
     ("\\`Projectile Rails Server\\'" "rails" xpm)
     ("\\`Python\\'" "python" xpm)
     ("\\`Ruby\\'" "ruby" xpm)
@@ -186,20 +185,20 @@ This was stole/modified from `c-save-buffer-state'"
     ("\\`Calendar\\'" #xf073 FontAwesome)
     ("\\`Help\\'" #xf059 FontAwesome)
     ("\\`WoMan\\'" #xf05a FontAwesome)
-    ("\\`C/l\\'" #xf107 font-mfizz)
+    ("\\`C\\(/.*\\|\\)\\'" #xf107 font-mfizz)
     ("\\`Custom\\'" #xf013 FontAwesome)
     ("\\`Go\\'" "go" xpm)
     ("\\` Rbow\\'" "rainbow" xpm)
     ("\\` ICY\\'" "icy" xpm) ;; http://www.clipartpal.com/clipart_pd/weather/ice_10206.html
     ("\\` Golden\\'" "golden" xpm) ;; Icon created by Arthur Shlain from Noun Project
     ("\\`BibTeX\\'\\'" "bibtex" xpm)
-    ("\\`C[+][+]/l\\'" #xf10c font-mfizz)
-    ("\\`C[#]/l\\'" #xf10d font-mfizz)
+    ("\\`C[+][+]\\(/.*\\|\\)\\'" #xf10c font-mfizz)
+    ("\\`C[#]\\(/.*\\|\\)\\'" #xf10d font-mfizz)
     ("\\`Elixir\\'" #xf115 font-mfizz)
     ("\\`Erlang\\'" #xf116 font-mfizz)
     ("\\`Haskell\\'" #xf126 font-mfizz)
     ("\\`Clojure\\'" #xf10a font-mfizz)
-    ("\\`Java/l\\'" #xf12b font-mfizz)
+    ("\\`Java\\(/.*\\|\\)\\'" #xf12b font-mfizz)
     ("\\`C?Perl\\'" #xf148 font-mfizz)
     ("\\`Octave\\'" "octave" xpm)
     ("\\`AHK\\'" "autohotkey" xpm)