diff --git a/LICENSE b/LICENSE
index 538b16c..fb331d7 100644
--- a/LICENSE
+++ b/LICENSE
@@ -4,8 +4,7 @@ This repository includes:
 For on related licenses for these binaries and libraries see https://github.com/lightvector/KataGo
 
 2. Icons from www.flaticon.com, used with permission with the following attributions:
-- New game/Save game/Load game/Configure icons/Flag icons: made by or derived from work by Freepik from www.flaticon.com
-- Next/Previous icons: derived from work by RoundIcons from www.flaticon.com
+- Save game/Load game/Elements of the configure icons/Flag icons: derived from work by Freepik from www.flaticon.com
 
 3. The True Type Font DIGITAL-7 version 1.02 by Sizenko Alexander, which is free for non-commercial use.
 
diff --git a/katrain/gui.kv b/katrain/gui.kv
index fd65cd1..578bb55 100644
--- a/katrain/gui.kv
+++ b/katrain/gui.kv
@@ -203,13 +203,13 @@
         Label:
             size_hint: 0.075, 0.5
         NavIconButton:
-            icon: 'img/flaticon/previous999.png'
+            icon: 'img/Previous-End.png'
             on_press: root.katrain('undo',999)
         NavIconButton:
-            icon: 'img/flaticon/previous5.png'
+            icon: 'img/Previous-5.png'
             on_press: root.katrain('undo',5)
         NavIconButton:
-            icon: 'img/flaticon/previous.png'
+            icon: 'img/Previous.png'
             on_press: root.katrain('undo')
         MDFloatLayout:
             size_hint: 0.05, 1
@@ -227,16 +227,16 @@
                 player: 'W'
                 text: ''
         NavIconButton:
-            icon: 'img/flaticon/next.png'
+            icon: 'img/Next.png'
             on_press: root.katrain('redo')
         NavIconButton:
-            icon: 'img/flaticon/next5.png'
+            icon: 'img/Next-5.png'
             on_press: root.katrain('redo',5)
         NavIconButton:
-            icon: 'img/flaticon/next999.png'
+            icon: 'img/Next-End.png'
             on_press: root.katrain('redo',999)
         NavIconButton:
-            icon: 'img/forward_-_child.png'
+            icon: 'img/Branch.png'
             on_press: root.katrain('switch-branch',1)
     ClickableLabel:
         pos_hint: {'center_x': 0.85,'center_y':0.5}
@@ -765,7 +765,7 @@
     background_color: BOX_BACKGROUND_COLOR
     MDFloatLayout:
         size_hint: None, 1
-        width: self.height
+        width: self.height + 16
         Image:
             id:image
             source: root.icon
@@ -892,38 +892,38 @@
         item_height: root.item_height
         MainMenuItem:
             text: i18n._('menu:newgame')
-            icon: 'img/flaticon/newgame.png'
+            icon: 'img/New-Game.png'
             shortcut: 'Ctrl-N'
             on_action: root.katrain("new-game-popup")
             height: root.item_height
         MainMenuItem:
             text: i18n._('menu:save')
-            icon: 'img/flaticon/floppy-disk.png'
+            icon: 'img/Save-Game.png'
             shortcut: 'Ctrl-S'
             on_action: root.katrain("output-sgf")
         MainMenuItem:
             text: i18n._('menu:load')
-            icon: 'img/flaticon/folder.png'
+            icon: 'img/Load-Game.png'
             shortcut: 'Ctrl-L'
             on_action: root.katrain("analyze-sgf-popup")
         MainMenuItem:
             text: i18n._('menu:clocksettings')
-            icon: 'img/flaticon/cogwheel.png'
+            icon: 'img/Time-Settings.png'
             shortcut: 'F5'
             on_action: root.katrain('timer-popup')
         MainMenuItem:
             text: i18n._('menu:teachsettings')
-            icon: 'img/flaticon/graduate.png'
+            icon: 'img/Teaching-Settings.png'
             shortcut: 'F6'
             on_action: root.katrain('teacher-popup')
         MainMenuItem:
             text: i18n._('menu:aisettings')
-            icon: 'img/flaticon/ai.png'
+            icon: 'img/AI-Settings.png'
             shortcut: 'F7'
             on_action: root.katrain('ai-popup')
         MainMenuItem:
             text: i18n._('menu:settings')
-            icon: 'img/flaticon/settings.png'
+            icon: 'img/General-Settings.png'
             shortcut: 'F8'
             on_action: root.katrain('config-popup')
     MenuLabel:
diff --git a/katrain/gui/controlspanel.py b/katrain/gui/controlspanel.py
index 7690101..ace3be9 100644
--- a/katrain/gui/controlspanel.py
+++ b/katrain/gui/controlspanel.py
@@ -116,10 +116,10 @@ class ControlsPanel(BoxLayout):
                 else:
                     current_node.time_used = 0
                 time_remaining = byo_len - current_node.time_used
-                while time_remaining < 0:
+                while time_remaining < 0 and player.periods_used < byo_num:
                     current_node.time_used -= byo_len
                     time_remaining += byo_len
                     player.periods_used += 1
             time_remaining = byo_len - current_node.time_used
             periods_rem = byo_num - player.periods_used
-            self.timer.state = (time_remaining, periods_rem, ai)
+            self.timer.state = (max(0,time_remaining), max(0,periods_rem), ai)
diff --git a/katrain/gui/kivyutils.py b/katrain/gui/kivyutils.py
index 6394606..40e934f 100644
--- a/katrain/gui/kivyutils.py
+++ b/katrain/gui/kivyutils.py
@@ -369,8 +369,8 @@ class CollapsablePanel(MDBoxLayout):
     height_open = NumericProperty(None)
 
     state = OptionProperty("open", options=["open", "close"])
-    close_icon = "img/flaticon/previous5.png"
-    open_icon = "img/flaticon/next5.png"
+    close_icon = "img/Previous-5.png"
+    open_icon = "img/Next-5.png"
 
     def __init__(self, **kwargs):
         self.header, self.contents, self.open_close_button = None, None, None
diff --git a/katrain/img/AI-Settings.png b/katrain/img/AI-Settings.png
new file mode 100644
index 0000000..0c2cfea
Binary files /dev/null and b/katrain/img/AI-Settings.png differ
diff --git a/katrain/img/Branch.png b/katrain/img/Branch.png
new file mode 100644
index 0000000..9e2d0e5
Binary files /dev/null and b/katrain/img/Branch.png differ
diff --git a/katrain/img/General-Settings.png b/katrain/img/General-Settings.png
new file mode 100644
index 0000000..ca51413
Binary files /dev/null and b/katrain/img/General-Settings.png differ
diff --git a/katrain/img/Load-Game.png b/katrain/img/Load-Game.png
new file mode 100644
index 0000000..0d07a61
Binary files /dev/null and b/katrain/img/Load-Game.png differ
diff --git a/katrain/img/New-Game.png b/katrain/img/New-Game.png
new file mode 100644
index 0000000..86ed669
Binary files /dev/null and b/katrain/img/New-Game.png differ
diff --git a/katrain/img/Next-5.png b/katrain/img/Next-5.png
new file mode 100644
index 0000000..24cc039
Binary files /dev/null and b/katrain/img/Next-5.png differ
diff --git a/katrain/img/Next-End.png b/katrain/img/Next-End.png
new file mode 100644
index 0000000..3bb1a70
Binary files /dev/null and b/katrain/img/Next-End.png differ
diff --git a/katrain/img/Next.png b/katrain/img/Next.png
new file mode 100644
index 0000000..39b6b61
Binary files /dev/null and b/katrain/img/Next.png differ
diff --git a/katrain/img/Previous-5.png b/katrain/img/Previous-5.png
new file mode 100644
index 0000000..1c19735
Binary files /dev/null and b/katrain/img/Previous-5.png differ
diff --git a/katrain/img/Previous-End.png b/katrain/img/Previous-End.png
new file mode 100644
index 0000000..ffc0336
Binary files /dev/null and b/katrain/img/Previous-End.png differ
diff --git a/katrain/img/Previous.png b/katrain/img/Previous.png
new file mode 100644
index 0000000..5c1d62a
Binary files /dev/null and b/katrain/img/Previous.png differ
diff --git a/katrain/img/Save-Game.png b/katrain/img/Save-Game.png
new file mode 100644
index 0000000..4de5680
Binary files /dev/null and b/katrain/img/Save-Game.png differ
diff --git a/katrain/img/Teaching-Settings.png b/katrain/img/Teaching-Settings.png
new file mode 100644
index 0000000..1602b6b
Binary files /dev/null and b/katrain/img/Teaching-Settings.png differ
diff --git a/katrain/img/Time-Settings.png b/katrain/img/Time-Settings.png
new file mode 100644
index 0000000..d1946b8
Binary files /dev/null and b/katrain/img/Time-Settings.png differ
diff --git a/katrain/img/flaticon/ai.png b/katrain/img/flaticon/ai.png
deleted file mode 100644
index 3d832db..0000000
Binary files a/katrain/img/flaticon/ai.png and /dev/null differ
diff --git a/katrain/img/flaticon/cogwheel.png b/katrain/img/flaticon/cogwheel.png
deleted file mode 100644
index 6fee5b5..0000000
Binary files a/katrain/img/flaticon/cogwheel.png and /dev/null differ
diff --git a/katrain/img/flaticon/floppy-disk.png b/katrain/img/flaticon/floppy-disk.png
deleted file mode 100644
index 841b76d..0000000
Binary files a/katrain/img/flaticon/floppy-disk.png and /dev/null differ
diff --git a/katrain/img/flaticon/folder.png b/katrain/img/flaticon/folder.png
deleted file mode 100644
index bb9f45d..0000000
Binary files a/katrain/img/flaticon/folder.png and /dev/null differ
diff --git a/katrain/img/flaticon/graduate.png b/katrain/img/flaticon/graduate.png
deleted file mode 100644
index 4b896b6..0000000
Binary files a/katrain/img/flaticon/graduate.png and /dev/null differ
diff --git a/katrain/img/flaticon/loadgame.png b/katrain/img/flaticon/loadgame.png
deleted file mode 100644
index b325b86..0000000
Binary files a/katrain/img/flaticon/loadgame.png and /dev/null differ
diff --git a/katrain/img/flaticon/newgame.png b/katrain/img/flaticon/newgame.png
deleted file mode 100644
index e797736..0000000
Binary files a/katrain/img/flaticon/newgame.png and /dev/null differ
diff --git a/katrain/img/flaticon/next.png b/katrain/img/flaticon/next.png
deleted file mode 100644
index b22f8c2..0000000
Binary files a/katrain/img/flaticon/next.png and /dev/null differ
diff --git a/katrain/img/flaticon/next5.png b/katrain/img/flaticon/next5.png
deleted file mode 100644
index 4b78239..0000000
Binary files a/katrain/img/flaticon/next5.png and /dev/null differ
diff --git a/katrain/img/flaticon/next999.png b/katrain/img/flaticon/next999.png
deleted file mode 100644
index 29c0c54..0000000
Binary files a/katrain/img/flaticon/next999.png and /dev/null differ
diff --git a/katrain/img/flaticon/norway.png b/katrain/img/flaticon/norway.png
deleted file mode 100644
index 88eb071..0000000
Binary files a/katrain/img/flaticon/norway.png and /dev/null differ
diff --git a/katrain/img/flaticon/previous.png b/katrain/img/flaticon/previous.png
deleted file mode 100644
index b8ed36b..0000000
Binary files a/katrain/img/flaticon/previous.png and /dev/null differ
diff --git a/katrain/img/flaticon/previous5.png b/katrain/img/flaticon/previous5.png
deleted file mode 100644
index a57f767..0000000
Binary files a/katrain/img/flaticon/previous5.png and /dev/null differ
diff --git a/katrain/img/flaticon/previous999.png b/katrain/img/flaticon/previous999.png
deleted file mode 100644
index f9b4a4f..0000000
Binary files a/katrain/img/flaticon/previous999.png and /dev/null differ
diff --git a/katrain/img/flaticon/savegame.png b/katrain/img/flaticon/savegame.png
deleted file mode 100644
index 5314455..0000000
Binary files a/katrain/img/flaticon/savegame.png and /dev/null differ
diff --git a/katrain/img/flaticon/settings.png b/katrain/img/flaticon/settings.png
deleted file mode 100644
index 0dc8f11..0000000
Binary files a/katrain/img/flaticon/settings.png and /dev/null differ
diff --git a/katrain/img/forward_-_child.png b/katrain/img/forward_-_child.png
deleted file mode 100644
index 5fce4b2..0000000
Binary files a/katrain/img/forward_-_child.png and /dev/null differ
diff --git a/katrain/img/hamburger.png b/katrain/img/hamburger.png
index f337350..0e1ef0c 100644
Binary files a/katrain/img/hamburger.png and b/katrain/img/hamburger.png differ