diff --git a/config/environments/production.rb b/config/environments/production.rb
index 60c0fe84c..947014ec5 100644
--- a/config/environments/production.rb
+++ b/config/environments/production.rb
@@ -26,7 +26,7 @@ Rails.application.configure do
   config.consider_all_requests_local       = false
   config.action_controller.perform_caching = true
 
-  config.public_file_server.enabled = ENV['RAILS_SERVE_STATIC_FILES'].present?
+  config.public_file_server.enabled = true
 
   # Mount Action Cable outside main process or domain
   # config.action_cable.mount_path = nil
diff --git a/index.html b/index.html
index 3a8cb2968..27a830b10 100644
--- a/index.html
+++ b/index.html
@@ -9,13 +9,13 @@
   <meta content="IE=edge" http-equiv="X-UA-Compatible" />
   <meta content="width=device-width, initial-scale=1" name="viewport" />
 
-  <link href="public/favicon/apple-touch-icon.png" rel="apple-touch-icon" sizes="180x180">
+  <link href="favicon/apple-touch-icon.png" rel="apple-touch-icon" sizes="180x180">
   </link>
-  <link href="public/favicon/favicon-32x32.png" rel="icon" sizes="32x32" type="image/png">
+  <link href="favicon/favicon-32x32.png" rel="icon" sizes="32x32" type="image/png">
   </link>
-  <link href="public/favicon/favicon-16x16.png" rel="icon" sizes="16x16" type="image/png">
+  <link href="favicon/favicon-16x16.png" rel="icon" sizes="16x16" type="image/png">
   </link>
-  <link href="public/manifest.webmanifest" rel="manifest">
+  <link href="manifest.webmanifest" rel="manifest">
   </link>
 
   <link color="#5bbad5" href="favicon/safari-pinned-tab.svg" rel="mask-icon">
diff --git a/package.json b/package.json
index 0580fcfe7..37ca9f227 100644
--- a/package.json
+++ b/package.json
@@ -89,7 +89,7 @@
     "@reach/tooltip": "^0.16.2",
     "@standardnotes/features": "1.20.3",
     "@standardnotes/sncrypto-web": "1.5.3",
-    "@standardnotes/snjs": "2.31.16",
+    "@standardnotes/snjs": "2.31.17",
     "mobx": "^6.3.5",
     "mobx-react-lite": "^3.2.2",
     "preact": "^10.5.15",
diff --git a/webpack.dev.js b/webpack.dev.js
index a081dd068..cbb5fd318 100644
--- a/webpack.dev.js
+++ b/webpack.dev.js
@@ -22,7 +22,7 @@ module.exports = (env, argv) => {
     ],
     devServer: {
       hot: 'only',
-      static: './',
+      static: './public',
       port,
       devMiddleware: {
         writeToDisk: argv.writeToDisk,
diff --git a/yarn.lock b/yarn.lock
index 3d4830a3c..b950dd052 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2655,10 +2655,10 @@
     buffer "^6.0.3"
     libsodium-wrappers "^0.7.9"
 
-"@standardnotes/snjs@2.31.16":
-  version "2.31.16"
-  resolved "https://registry.yarnpkg.com/@standardnotes/snjs/-/snjs-2.31.16.tgz#3f7b6e9dd61974a98092c8c6560dc7c8628473d9"
-  integrity sha512-ZuXiADOCVMJSiqOJ5cp1xBzdycoobGJUi5KaP619ips63+r9wZpF99ACxTMUg3TTl1v3Kq0ZwtchBnEvKl6IGQ==
+"@standardnotes/snjs@2.31.17":
+  version "2.31.17"
+  resolved "https://registry.yarnpkg.com/@standardnotes/snjs/-/snjs-2.31.17.tgz#2b051d6aa75bdb3c249252eb672a6734b6a6ebf0"
+  integrity sha512-oCSC3sseS4aDPrM3rNzrsCjxJA5E0EOilIMBTODO7r3tEVtKzT0nJayYeIsu5lk/0LtoQO89mE4u2VRYJfZg/w==
   dependencies:
     "@standardnotes/auth" "3.8.1"
     "@standardnotes/common" "1.2.1"