diff --git a/frontend/ui/data/creoptions.lua b/frontend/ui/data/creoptions.lua
index aa12c5954..a02ab1f34 100644
--- a/frontend/ui/data/creoptions.lua
+++ b/frontend/ui/data/creoptions.lua
@@ -37,9 +37,10 @@ local CreOptions = {
 			{
 				name = "line_spacing",
 				name_text = S.LINE_SPACING,
-				item_text = {S.DECREASE, S.INCREASE},
+				toggle = {S.DECREASE, S.INCREASE},
+				alternate = false,
 				args = {"decrease", "increase"},
-				default_arg = nil,
+				default_arg = "decrease",
 				event = "ChangeLineSpace",
 			},
 			{
@@ -83,19 +84,17 @@ local CreOptions = {
 			{
 				name = "font_weight",
 				name_text = S.FONT_WEIGHT,
-				item_text = {S.TOGGLE_BOLD},
-				-- args is indeed not used, we put here just to keep the
-				-- UI happy.
-				args = {1},
+				toggle = {S.TOGGLE_BOLD},
 				default_arg = nil,
 				event = "ToggleFontBolder",
 			},
 			{
 				name = "font_gamma",
 				name_text = S.GAMMA,
-				item_text = {S.DECREASE, S.INCREASE},
+				toggle = {S.DECREASE, S.INCREASE},
+				alternate = false,
 				args = {"decrease", "increase"},
-				default_arg = nil,
+				default_arg = "increase",
 				event = "ChangeFontGamma",
 			}
 		}
diff --git a/frontend/ui/reader/readerrolling.lua b/frontend/ui/reader/readerrolling.lua
index 0d2654440..ef87224f4 100644
--- a/frontend/ui/reader/readerrolling.lua
+++ b/frontend/ui/reader/readerrolling.lua
@@ -268,6 +268,7 @@ function ReaderRolling:updatePos()
 		self.old_page = new_page
 		self.ui:handleEvent(Event:new("UpdateToc"))
 	end
+	UIManager.repaint_all = true
 end
 
 function ReaderRolling:onChangeViewMode()
diff --git a/frontend/ui/widget/toggleswitch.lua b/frontend/ui/widget/toggleswitch.lua
index a01763e4a..a19921fa9 100644
--- a/frontend/ui/widget/toggleswitch.lua
+++ b/frontend/ui/widget/toggleswitch.lua
@@ -103,6 +103,8 @@ function ToggleSwitch:togglePosition(position)
 	if self.n_pos == 2 and self.alternate ~= false then
 		self.position = (self.position+1)%self.n_pos
 		self.position = self.position == 0 and self.n_pos or self.position
+	elseif self.n_pos == 1 then
+		self.position = self.position == 1 and 0 or 1
 	else
 		self.position = position
 	end