diff --git a/app/helpers/theme_helper.rb b/app/helpers/theme_helper.rb
index 7e4fd0a002..e16086aaeb 100644
--- a/app/helpers/theme_helper.rb
+++ b/app/helpers/theme_helper.rb
@@ -26,7 +26,7 @@ module ThemeHelper
   def custom_stylesheet
     if active_custom_stylesheet.present?
       stylesheet_link_tag(
-        custom_css_path(active_custom_stylesheet),
+        "/css/#{active_custom_stylesheet}.css", # custom_css_path(active_custom_stylesheet),
         host: root_url,
         media: :all,
         skip_pipeline: true
diff --git a/app/javascript/mastodon/actions/notifications.js b/app/javascript/mastodon/actions/notifications.js
index 5376df03dc..3dc63fe5e6 100644
--- a/app/javascript/mastodon/actions/notifications.js
+++ b/app/javascript/mastodon/actions/notifications.js
@@ -21,7 +21,7 @@ export const NOTIFICATIONS_SET_BROWSER_SUPPORT    = 'NOTIFICATIONS_SET_BROWSER_S
 export const NOTIFICATIONS_SET_BROWSER_PERMISSION = 'NOTIFICATIONS_SET_BROWSER_PERMISSION';
 
 const messages = defineMessages({
-  mention: { id: 'notification.mention', defaultMessage: '{name} mentioned you' },
+  // mention: { id: 'notification.mention', defaultMessage: '{name} mentioned you' },
   group: { id: 'notifications.group', defaultMessage: '{count} notifications' },
   'message_admin.report': { id: 'notification.admin.report', defaultMessage: '{name} reported {target}' },
   'message_admin.sign_up': { id: 'notification.admin.sign_up', defaultMessage: '{name} signed up' },