diff --git a/frontend/apps/filemanager/filemanager.lua b/frontend/apps/filemanager/filemanager.lua
index 4360efe96..f7c0f9bcc 100644
--- a/frontend/apps/filemanager/filemanager.lua
+++ b/frontend/apps/filemanager/filemanager.lua
@@ -101,7 +101,7 @@ end
 function FileManager:onSetDimensions(dimen)
     -- update listening according to new screen dimen
     if Device:isTouchDevice() then
-        self:initGesListener()
+        self:updateTouchZonesOnScreenResize(dimen)
     end
 end
 
@@ -518,6 +518,7 @@ function FileManager:init()
         table.insert(self, NetworkListener:new{ ui = self })
     end
 
+    self:initGesListener()
     self:handleEvent(Event:new("SetDimensions", self.dimen))
 end
 
diff --git a/frontend/dispatcher.lua b/frontend/dispatcher.lua
index fc55db9b7..7545fa1c7 100644
--- a/frontend/dispatcher.lua
+++ b/frontend/dispatcher.lua
@@ -623,14 +623,14 @@ function Dispatcher:execute(ui, settings, gesture)
                 local arg = v ~= 0 and v or gesture or 0
                 ui:handleEvent(Event:new(settingsList[k].event, arg))
             end
-            if settingsList[k].configurable ~= nil then
-                 local value = v
-                 if type(v) ~= "number" then
-                     for i, r in ipairs(settingsList[k].args) do
+            if ui.document and settingsList[k].configurable then
+                local value = v
+                if type(v) ~= "number" then
+                    for i, r in ipairs(settingsList[k].args) do
                         if v == r then value = settingsList[k].configurable.values[i] break end
-                     end
-                 end
-                 ui.document.configurable[settingsList[k].configurable.name] = value
+                    end
+                end
+                ui.document.configurable[settingsList[k].configurable.name] = value
             end
         end
     end
diff --git a/frontend/ui/data/creoptions.lua b/frontend/ui/data/creoptions.lua
index ec364a722..9e979b6d8 100644
--- a/frontend/ui/data/creoptions.lua
+++ b/frontend/ui/data/creoptions.lua
@@ -2,6 +2,7 @@ local Device = require("device")
 local Screen = Device.screen
 local optionsutil = require("ui/data/optionsutil")
 local _ = require("gettext")
+local C_ = _.pgettext
 
 -- Get font size numbers as a table of strings
 local tableOfNumbersToTableOfStrings = function(numbers)
@@ -27,6 +28,8 @@ local CreOptions = {
                     "rotation.90CW",
                     "rotation.180UD",
                 },
+                -- For Dispatcher's sake
+                labels = {C_("Rotation", "⤹ 90°"), C_("Rotation", "↑ 0°"), C_("Rotation", "⤸ 90°"), C_("Rotation", "↓ 180°")},
                 alternate = false,
                 values = {Screen.ORIENTATION_LANDSCAPE_ROTATED, Screen.ORIENTATION_PORTRAIT, Screen.ORIENTATION_LANDSCAPE, Screen.ORIENTATION_PORTRAIT_ROTATED},
                 args = {Screen.ORIENTATION_LANDSCAPE_ROTATED, Screen.ORIENTATION_PORTRAIT, Screen.ORIENTATION_LANDSCAPE, Screen.ORIENTATION_PORTRAIT_ROTATED},
diff --git a/frontend/ui/data/koptoptions.lua b/frontend/ui/data/koptoptions.lua
index 9f8392ab2..ab7ac3695 100644
--- a/frontend/ui/data/koptoptions.lua
+++ b/frontend/ui/data/koptoptions.lua
@@ -35,6 +35,8 @@ local KoptOptions = {
                     "rotation.90CW",
                     "rotation.180UD",
                 },
+                -- For Dispatcher's sake
+                labels = {C_("Rotation", "⤹ 90°"), C_("Rotation", "↑ 0°"), C_("Rotation", "⤸ 90°"), C_("Rotation", "↓ 180°")},
                 alternate = false,
                 values = {Screen.ORIENTATION_LANDSCAPE_ROTATED, Screen.ORIENTATION_PORTRAIT, Screen.ORIENTATION_LANDSCAPE, Screen.ORIENTATION_PORTRAIT_ROTATED},
                 args = {Screen.ORIENTATION_LANDSCAPE_ROTATED, Screen.ORIENTATION_PORTRAIT, Screen.ORIENTATION_LANDSCAPE, Screen.ORIENTATION_PORTRAIT_ROTATED},