diff --git a/src/NzbDrone.Core/Parser/Parser.cs b/src/NzbDrone.Core/Parser/Parser.cs
index 81c816873..19d4acf33 100644
--- a/src/NzbDrone.Core/Parser/Parser.cs
+++ b/src/NzbDrone.Core/Parser/Parser.cs
@@ -20,14 +20,14 @@ namespace NzbDrone.Core.Parser
             //Special, Despecialized, etc. Edition Movies, e.g: Mission.Impossible.3.Special.Edition.2011
              new Regex(@"^(?<title>.+?)?(?:(?:[-_\W](?<![()\[!]))*(?<edition>(\w+\.?edition))\.(?<year>(?<!e|x)\d{4}(?!p|i|\d+|\)|\]|\W\d+)))+(\W+|_|$)(?!\\)",
                           RegexOptions.IgnoreCase | RegexOptions.Compiled),
-             //Special, Despecialized, etc. Edition Movies, e.g: Mission.Impossible.3.2011.Special.Edition
-             new Regex(@"^(?<title>.+?)?(?:(?:[-_\W](?<![()\[!]))*(?<year>(?<!e|x)\d{4}(?!p|i|\d+|\)|\]|\W\d+)))+(\W+|_|$)(?!\\)(?<edition>(\w+\.?edition))",
+             //Special, Despecialized, etc. Edition Movies, e.g: Mission.Impossible.3.2011.Special.Edition //TODO: Seems to slow down parsing heavily!
+             new Regex(@"^(?<title>.+?)?(?:(?:[-_\W](?<![()\[!]))*(?<year>(?<!e|x)\d{4}(?!p|i|\d+|\)|\]|\W\d+)))+(\W+|_|$)(?!\\)(?<edition>((\w+\.?){1,3}edition))",
                           RegexOptions.IgnoreCase | RegexOptions.Compiled),
              //Cut Movies, e.g: Mission.Impossible.3.Directors.Cut.2011
              new Regex(@"^(?<title>.+?)?(?:(?:[-_\W](?<![()\[!]))*(?<edition>(\w+\.?cut))\.(?<year>(?<!e|x)\d{4}(?!p|i|\d+|\)|\]|\W\d+)))+(\W+|_|$)(?!\\)",
                           RegexOptions.IgnoreCase | RegexOptions.Compiled),
              //Cut Movies, e.g: Mission.Impossible.3.2011.Directors.Cut
-             new Regex(@"^(?<title>.+?)?(?:(?:[-_\W](?<![()\[!]))*(?<year>(?<!e|x)\d{4}(?!p|i|\d+|\)|\]|\W\d+)))+(\W+|_|$)(?!\\)(?<edition>(\w+\.?cut))",
+             new Regex(@"^(?<title>.+?)?(?:(?:[-_\W](?<![()\[!]))*(?<year>(?<!e|x)\d{4}(?!p|i|\d+|\)|\]|\W\d+)))+(\W+|_|$)(?!\\)(?<edition>((\w+\.?){1,3}cut))",
                           RegexOptions.IgnoreCase | RegexOptions.Compiled),
 
              //Normal movie format, e.g: Mission.Impossible.3.2011
diff --git a/src/UI/Cells/EditionCell.js b/src/UI/Cells/EditionCell.js
index 1d3c8e554..c110807f5 100644
--- a/src/UI/Cells/EditionCell.js
+++ b/src/UI/Cells/EditionCell.js
@@ -24,7 +24,7 @@ module.exports = Backgrid.Cell.extend({
         if (cut) {
           this.$el.html('<i class="icon-sonarr-form-cut"/ title="{0}">'.format(edition));
         } else {
-          this.$el.html('<i class="icon-sonarr-form-info"/ title="{0}">'.format(edition));
+          this.$el.html('<i class="icon-sonarr-form-special"/ title="{0}">'.format(edition));
         }
 
         /*this.$el.popover({
diff --git a/src/UI/Content/icons.less b/src/UI/Content/icons.less
index 7b00ed13b..78f78a408 100644
--- a/src/UI/Content/icons.less
+++ b/src/UI/Content/icons.less
@@ -125,6 +125,10 @@
   .fa-icon-content(@fa-var-scissors);
 }
 
+.icon-sonarr-form-special {
+  .fa-icon-content(@fa-var-exclamation-circle);
+}
+
 .icon-sonarr-form-info-link {
   .clickable();
   .fa-icon-content(@fa-var-info-circle);