diff --git a/data/gui/widget/button_default.cfg b/data/gui/widget/button_default.cfg
index 51ad1aaaefc..3ac5fbe34a3 100644
--- a/data/gui/widget/button_default.cfg
+++ b/data/gui/widget/button_default.cfg
@@ -186,7 +186,120 @@
 
 [/button_definition]
 
+#define _GUI_RESOLUTION_ICON_ONLY RESOLUTION MIN_WIDTH DEFAULT_WIDTH HEIGHT EXTRA_WIDTH EXTRA_HEIGHT FONT_SIZE IPF ALPHA IMAGE_OVERLAY
+	[resolution]
+
+		{RESOLUTION}
+
+		min_width = {MIN_WIDTH}
+		min_height = {HEIGHT}
+
+		default_width = {DEFAULT_WIDTH}
+		default_height = {HEIGHT}
+
+		max_width = 0
+		max_height = {HEIGHT}
+
+		text_extra_width = {EXTRA_WIDTH}
+		text_extra_height = {EXTRA_HEIGHT}
+		text_font_size = {FONT_SIZE}
+
+		[state_enabled]
+
+			[draw]
+
+				{_GUI_STATE "background"
+					({GUI__BORDER_COLOR      ALPHA={ALPHA}})
+					({GUI__BORDER_COLOR_DARK ALPHA={ALPHA}}) ("21, 79, 109, 255") {IPF}}
+
+				[image]
+					{GUI_CENTERED_IMAGE}
+
+					name = {IMAGE_OVERLAY} + ".png{IPF}"
+				[/image]
+
+			[/draw]
+
+		[/state_enabled]
+
+		[state_disabled]
+
+			[draw]
+
+				{_GUI_STATE "background"
+					({GUI__FONT_COLOR_DISABLED__DEFAULT ALPHA={ALPHA}})
+					("89,  89,  89,  {ALPHA}")
+					("1, 10, 16, 255") "~GS(){IPF}"}
+
+				[image]
+					{GUI_CENTERED_IMAGE}
+
+					name = {IMAGE_OVERLAY} + ".png~GS(){IPF}"
+				[/image]
+
+			[/draw]
+
+		[/state_disabled]
+
+		[state_pressed]
+
+			[draw]
+
+				{_GUI_STATE "background-pressed"
+					({GUI__BORDER_COLOR      ALPHA={ALPHA}})
+					({GUI__BORDER_COLOR_DARK ALPHA={ALPHA}}) ("1, 10, 16, 255") {IPF}}
+
+				[image]
+					{GUI_CENTERED_IMAGE}
+
+					name = {IMAGE_OVERLAY} + "-pressed.png{IPF}"
+				[/image]
+
+			[/draw]
+
+		[/state_pressed]
+
+		[state_focused]
+
+			[draw]
+
+				{_GUI_STATE "background-active"
+					({GUI__BORDER_COLOR      ALPHA={ALPHA}})
+					({GUI__BORDER_COLOR_DARK ALPHA={ALPHA}}) ("12, 108, 157, 255") {IPF}}
+
+				[image]
+					{GUI_CENTERED_IMAGE}
+
+					name = {IMAGE_OVERLAY} + "-active.png{IPF}"
+				[/image]
+
+			[/draw]
+
+		[/state_focused]
+
+	[/resolution]
+#enddef
+
+[button_definition]
+
+	id = "left_arrow_ornate"
+	description = "Left arrow button."
+
+	{_GUI_RESOLUTION_ICON_ONLY () 40 56 26 13 4 ({_GUI_BUTTON_FONT_SIZE}) () 255 ("icons/arrows/long_arrow_ornate_left")}
+
+[/button_definition]
+
+[button_definition]
+
+	id = "right_arrow_ornate"
+	description = "Right arrow button."
+
+	{_GUI_RESOLUTION_ICON_ONLY () 40 56 26 13 4 ({_GUI_BUTTON_FONT_SIZE}) () 255 ("icons/arrows/long_arrow_ornate_right")}
+
+[/button_definition]
+
 #undef _GUI_POINT
 #undef _GUI_LINE
 #undef _GUI_STATE
 #undef _GUI_RESOLUTION
+#undef _GUI_RESOLUTION_ICON_ONLY
diff --git a/data/gui/window/story_viewer.cfg b/data/gui/window/story_viewer.cfg
index 7d188552646..ffc29308250 100644
--- a/data/gui/window/story_viewer.cfg
+++ b/data/gui/window/story_viewer.cfg
@@ -52,25 +52,45 @@
 
 				[column]
 					grow_factor = 0
-
 					horizontal_grow = true
 					vertical_alignment = "bottom"
 
 					[grid]
 
-						# TODO: proper left/right buttons
 						[row]
+							grow_factor = 0
 
 							[column]
-								border = "left,right,top"
-								border_size = 20
-								horizontal_alignment = "right"
 
-								[button]
-									id = "next"
-									definition = "default"
-									label = _ "Next"
-								[/button]
+								[grid]
+
+									[row]
+
+										[column]
+											border = "left,top,bottom"
+											border_size = 10
+
+											[button]
+												id = "back"
+												definition = "left_arrow_ornate"
+											[/button]
+
+										[/column]
+
+										[column]
+											border = "right,top,bottom"
+											border_size = 10
+
+											[button]
+												id = "next"
+												definition = "right_arrow_ornate"
+											[/button]
+
+										[/column]
+
+									[/row]
+								
+								[/grid]
 
 							[/column]
 
@@ -79,26 +99,8 @@
 						[row]
 
 							[column]
-								border = "left,right"
+								border = "left,right,bottom"
 								border_size = 20
-								horizontal_alignment = "right"
-
-								[button]
-									id = "back"
-									definition = "default"
-									label = _ "Back"
-								[/button]
-
-							[/column]
-
-						[/row]
-
-						[row]
-
-							[column]
-								border = "all"
-								border_size = 20
-								horizontal_alignment = "right"
 
 								[button]
 									id = "cancel"