diff --git a/Cores/DeltaCore b/Cores/DeltaCore
index 08b0e43..76cd963 160000
--- a/Cores/DeltaCore
+++ b/Cores/DeltaCore
@@ -1 +1 @@
-Subproject commit 08b0e43293282cf92ba7a2838dc1b1e2cc7fbdae
+Subproject commit 76cd9633d0ad97c4a422787fcc5f2cc5060e6199
diff --git a/Cores/SNESDeltaCore b/Cores/SNESDeltaCore
index ab500a8..f4e2781 160000
--- a/Cores/SNESDeltaCore
+++ b/Cores/SNESDeltaCore
@@ -1 +1 @@
-Subproject commit ab500a88abf285393b5498b0d2cda594a6f2a1e2
+Subproject commit f4e27814258993234883fbca040ea66dc1d9609e
diff --git a/Delta/Emulation/EmulationViewController.swift b/Delta/Emulation/EmulationViewController.swift
index cdfebf3..7ddd159 100644
--- a/Delta/Emulation/EmulationViewController.swift
+++ b/Delta/Emulation/EmulationViewController.swift
@@ -147,12 +147,16 @@ class EmulationViewController: UIViewController
                 let dismissAction: (PauseItem -> Void) = { item in
                     pauseViewController.dismiss()
                 }
+
+                let saveStateItem = PauseItem(image: UIImage(named: "SmallPause")!, text: NSLocalizedString("Save State", comment: ""), action: dismissAction)
+                let loadStateItem = PauseItem(image: UIImage(named: "SmallPause")!, text: NSLocalizedString("Load State", comment: ""), action: dismissAction)
+                let cheatCodesItem = PauseItem(image: UIImage(named: "SmallPause")!, text: NSLocalizedString("Cheat Codes", comment: ""), action: dismissAction)
+                let sustainButtonItem = PauseItem(image: UIImage(named: "SmallPause")!, text: NSLocalizedString("Sustain Button", comment: ""), action: dismissAction)
                 
-                let saveStateItem = PauseItem(image: UIImage(named: "SmallPause")!, text: "Save State", action: dismissAction)
-                let loadStateItem = PauseItem(image: UIImage(named: "SmallPause")!, text: "Load State", action: dismissAction)
-                let cheatCodesItem = PauseItem(image: UIImage(named: "SmallPause")!, text: "Cheat Codes", action: dismissAction)
-                let fastForwardItem = PauseItem(image: UIImage(named: "SmallPause")!, text: "Fast Forward", action: dismissAction)
-                let sustainButtonItem = PauseItem(image: UIImage(named: "SmallPause")!, text: "Sustain Button", action: dismissAction)
+                var fastForwardItem = PauseItem(image: UIImage(named: "FastForward")!, text: NSLocalizedString("Fast Forward", comment: ""), action: { [weak self] item in
+                    self?.emulatorCore.fastForwarding = item.selected
+                })
+                fastForwardItem.selected = self.emulatorCore.fastForwarding
                 
                 pauseViewController.items = [saveStateItem, loadStateItem, cheatCodesItem, fastForwardItem, sustainButtonItem]
             }
diff --git a/Resources/Assets.xcassets/Pause Icons/Contents.json b/Resources/Assets.xcassets/Pause Icons/Contents.json
new file mode 100644
index 0000000..da4a164
--- /dev/null
+++ b/Resources/Assets.xcassets/Pause Icons/Contents.json	
@@ -0,0 +1,6 @@
+{
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}
\ No newline at end of file
diff --git a/Resources/Assets.xcassets/Pause Icons/FastForward.imageset/Contents.json b/Resources/Assets.xcassets/Pause Icons/FastForward.imageset/Contents.json
new file mode 100644
index 0000000..f4f1d3c
--- /dev/null
+++ b/Resources/Assets.xcassets/Pause Icons/FastForward.imageset/Contents.json	
@@ -0,0 +1,26 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "filename" : "FastForward.png",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "FastForward@2x.png",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "FastForward@3x.png",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  },
+  "properties" : {
+    "template-rendering-intent" : "template"
+  }
+}
\ No newline at end of file
diff --git a/Resources/Assets.xcassets/Pause Icons/FastForward.imageset/FastForward.png b/Resources/Assets.xcassets/Pause Icons/FastForward.imageset/FastForward.png
new file mode 100644
index 0000000..b871621
Binary files /dev/null and b/Resources/Assets.xcassets/Pause Icons/FastForward.imageset/FastForward.png differ
diff --git a/Resources/Assets.xcassets/Pause Icons/FastForward.imageset/FastForward@2x.png b/Resources/Assets.xcassets/Pause Icons/FastForward.imageset/FastForward@2x.png
new file mode 100644
index 0000000..b9bb085
Binary files /dev/null and b/Resources/Assets.xcassets/Pause Icons/FastForward.imageset/FastForward@2x.png differ
diff --git a/Resources/Assets.xcassets/Pause Icons/FastForward.imageset/FastForward@3x.png b/Resources/Assets.xcassets/Pause Icons/FastForward.imageset/FastForward@3x.png
new file mode 100644
index 0000000..5ad65fa
Binary files /dev/null and b/Resources/Assets.xcassets/Pause Icons/FastForward.imageset/FastForward@3x.png differ
diff --git a/Resources/Assets.xcassets/Pause.imageset/Contents.json b/Resources/Assets.xcassets/Pause Icons/Pause.imageset/Contents.json
similarity index 100%
rename from Resources/Assets.xcassets/Pause.imageset/Contents.json
rename to Resources/Assets.xcassets/Pause Icons/Pause.imageset/Contents.json
diff --git a/Resources/Assets.xcassets/Pause.imageset/Pause.png b/Resources/Assets.xcassets/Pause Icons/Pause.imageset/Pause.png
similarity index 100%
rename from Resources/Assets.xcassets/Pause.imageset/Pause.png
rename to Resources/Assets.xcassets/Pause Icons/Pause.imageset/Pause.png
diff --git a/Resources/Assets.xcassets/Pause.imageset/Pause@2x.png b/Resources/Assets.xcassets/Pause Icons/Pause.imageset/Pause@2x.png
similarity index 100%
rename from Resources/Assets.xcassets/Pause.imageset/Pause@2x.png
rename to Resources/Assets.xcassets/Pause Icons/Pause.imageset/Pause@2x.png
diff --git a/Resources/Assets.xcassets/Pause.imageset/Pause@3x.png b/Resources/Assets.xcassets/Pause Icons/Pause.imageset/Pause@3x.png
similarity index 100%
rename from Resources/Assets.xcassets/Pause.imageset/Pause@3x.png
rename to Resources/Assets.xcassets/Pause Icons/Pause.imageset/Pause@3x.png
diff --git a/Resources/Assets.xcassets/SmallPause.imageset/Contents.json b/Resources/Assets.xcassets/Pause Icons/SmallPause.imageset/Contents.json
similarity index 100%
rename from Resources/Assets.xcassets/SmallPause.imageset/Contents.json
rename to Resources/Assets.xcassets/Pause Icons/SmallPause.imageset/Contents.json
diff --git a/Resources/Assets.xcassets/SmallPause.imageset/SmallPause.png b/Resources/Assets.xcassets/Pause Icons/SmallPause.imageset/SmallPause.png
similarity index 100%
rename from Resources/Assets.xcassets/SmallPause.imageset/SmallPause.png
rename to Resources/Assets.xcassets/Pause Icons/SmallPause.imageset/SmallPause.png
diff --git a/Resources/Assets.xcassets/SmallPause.imageset/SmallPause@2x.png b/Resources/Assets.xcassets/Pause Icons/SmallPause.imageset/SmallPause@2x.png
similarity index 100%
rename from Resources/Assets.xcassets/SmallPause.imageset/SmallPause@2x.png
rename to Resources/Assets.xcassets/Pause Icons/SmallPause.imageset/SmallPause@2x.png
diff --git a/Resources/Assets.xcassets/SmallPause.imageset/SmallPause@3x.png b/Resources/Assets.xcassets/Pause Icons/SmallPause.imageset/SmallPause@3x.png
similarity index 100%
rename from Resources/Assets.xcassets/SmallPause.imageset/SmallPause@3x.png
rename to Resources/Assets.xcassets/Pause Icons/SmallPause.imageset/SmallPause@3x.png