diff --git a/src/NzbDrone.Core.Test/OrganizerTests/FileNameBuilderFixture.cs b/src/NzbDrone.Core.Test/OrganizerTests/FileNameBuilderFixture.cs
index a0eb1106e..d703ec1c5 100644
--- a/src/NzbDrone.Core.Test/OrganizerTests/FileNameBuilderFixture.cs
+++ b/src/NzbDrone.Core.Test/OrganizerTests/FileNameBuilderFixture.cs
@@ -893,7 +893,7 @@ namespace NzbDrone.Core.Test.OrganizerTests
             _namingConfig.StandardEpisodeFormat = "{Episode.CleanTitle}";
 
             Subject.BuildFileName(new List<Episode> { _episode1 }, _series, _episodeFile)
-                   .Should().Be("Rule.23.Never.Lie.to.the.Kids");
+                   .Should().Be("Rule.#23.Never.Lie.to.the.Kids");
         }
 
         [Test]
diff --git a/src/NzbDrone.Core/Organizer/FileNameBuilder.cs b/src/NzbDrone.Core/Organizer/FileNameBuilder.cs
index 0c90e6538..3d3fcdff3 100644
--- a/src/NzbDrone.Core/Organizer/FileNameBuilder.cs
+++ b/src/NzbDrone.Core/Organizer/FileNameBuilder.cs
@@ -56,7 +56,7 @@ namespace NzbDrone.Core.Organizer
         private static readonly Regex FileNameCleanupRegex = new Regex(@"([- ._])(\1)+", RegexOptions.Compiled);
         private static readonly Regex TrimSeparatorsRegex = new Regex(@"[- ._]$", RegexOptions.Compiled);
 
-        private static readonly Regex ScenifyRemoveChars = new Regex(@"[^a-z0-9+\/ ]", RegexOptions.Compiled | RegexOptions.IgnoreCase);
+        private static readonly Regex ScenifyRemoveChars = new Regex(@"[^a-z0-9+#\/ ]", RegexOptions.Compiled | RegexOptions.IgnoreCase);
         private static readonly Regex ScenifyReplaceChars = new Regex(@"[+\/]", RegexOptions.Compiled | RegexOptions.IgnoreCase);
 
         private static readonly char[] EpisodeTitleTrimCharacters = new[] { ' ', '.', '?' };
diff --git a/src/UI/Cells/cells.less b/src/UI/Cells/cells.less
index ee5900cba..82208d596 100644
--- a/src/UI/Cells/cells.less
+++ b/src/UI/Cells/cells.less
@@ -60,6 +60,8 @@
 .download-report-cell {
   .clickable();
 
+  width : 32px;
+
   i {
     .clickable();
   }
diff --git a/src/UI/Settings/MediaManagement/Naming/Partials/EpisodeTitleNamingPartial.hbs b/src/UI/Settings/MediaManagement/Naming/Partials/EpisodeTitleNamingPartial.hbs
index 17128f526..10f2ec67e 100644
--- a/src/UI/Settings/MediaManagement/Naming/Partials/EpisodeTitleNamingPartial.hbs
+++ b/src/UI/Settings/MediaManagement/Naming/Partials/EpisodeTitleNamingPartial.hbs
@@ -4,8 +4,8 @@
         <li><a href="#" data-token="Episode Title">Episode Title</a></li>
         <li><a href="#" data-token="Episode.Title">Episode.Title</a></li>
         <li><a href="#" data-token="Episode_Title">Episode_Title</a></li>
-        <li><a href="#" data-token="Episode Title">Episode CleanTitle</a></li>
-        <li><a href="#" data-token="Episode.Title">Episode.CleanTitle</a></li>
-        <li><a href="#" data-token="Episode_Title">Episode_CleanTitle</a></li>
+        <li><a href="#" data-token="Episode CleanTitle">Episode CleanTitle</a></li>
+        <li><a href="#" data-token="Episode.CleanTitle">Episode.CleanTitle</a></li>
+        <li><a href="#" data-token="Episode_CleanTitle">Episode_CleanTitle</a></li>
     </ul>
 </li>