diff --git a/secant/Features/RecoveryPhraseDisplay/RecoveryPhraseDisplayView.swift b/secant/Features/RecoveryPhraseDisplay/RecoveryPhraseDisplayView.swift
index e6d957a3..862ee3fc 100644
--- a/secant/Features/RecoveryPhraseDisplay/RecoveryPhraseDisplayView.swift
+++ b/secant/Features/RecoveryPhraseDisplay/RecoveryPhraseDisplayView.swift
@@ -75,7 +75,7 @@ struct RecoveryPhraseDisplayView: View {
         .navigationBarHidden(true)
     }
 }
-// TODO: This should have a #DEBUG tag, but if so, it's not possible to compile this on release mode and submit it to testflight
+// TODO: This should have a #DEBUG tag, but if so, it's not possible to compile this on release mode and submit it to testflight https://github.com/zcash/ZcashLightClientKit/issues/695
 extension RecoveryPhraseDisplayStore {
     static var demo: RecoveryPhraseDisplayStore {
         RecoveryPhraseDisplayStore(
@@ -86,7 +86,7 @@ extension RecoveryPhraseDisplayStore {
     }
 }
 
-// TODO: This should have a #DEBUG tag, but if so, it's not possible to compile this on release mode and submit it to testflight
+// TODO: This should have a #DEBUG tag, but if so, it's not possible to compile this on release mode and submit it to testflight https://github.com/zcash/ZcashLightClientKit/issues/695
 extension RecoveryPhrase {
     static let testPhrase = [
         // 1
diff --git a/secant/Features/Root/RootInitialization.swift b/secant/Features/Root/RootInitialization.swift
index a96a5b18..d8361af3 100644
--- a/secant/Features/Root/RootInitialization.swift
+++ b/secant/Features/Root/RootInitialization.swift
@@ -152,7 +152,7 @@ extension RootReducer {
                         Effect(value: .phraseValidation(.displayBackedUpPhrase))
                     )
                 } catch {
-                    // TODO [#201]: - merge with issue 201 (https://github.com/zcash/secant-ios-wallet/issues/201) and its Error States
+                    // TODO [#201]: - merge with issue 221 (https://github.com/zcash/secant-ios-wallet/issues/221) and its Error States
                 }
 
                 return .none
diff --git a/secant/Features/Settings/SettingsStore.swift b/secant/Features/Settings/SettingsStore.swift
index cd382413..937abea9 100644
--- a/secant/Features/Settings/SettingsStore.swift
+++ b/secant/Features/Settings/SettingsStore.swift
@@ -49,7 +49,7 @@ struct SettingsReducer: ReducerProtocol {
                     state.phraseDisplayState.phrase = recoveryPhrase
                     return Effect(value: .updateDestination(.backupPhrase))
                 } catch {
-                    // TODO [#201]: - merge with issue 201 (https://github.com/zcash/secant-ios-wallet/issues/201) and its Error States
+                    // TODO [#221]: - merge with issue 221 (https://github.com/zcash/secant-ios-wallet/issues/221) and its Error States
                     return .none
                 }
                 
diff --git a/secant/UI Components/DesignGuide.swift b/secant/UI Components/DesignGuide.swift
index 38e7f364..322b2528 100644
--- a/secant/UI Components/DesignGuide.swift	
+++ b/secant/UI Components/DesignGuide.swift	
@@ -69,12 +69,12 @@ struct SmallVisualElements: View {
                         .navigationButtonStyle
                         .frame(width: 80, height: 40)
 
-                    // TODO: Change state to selected
+                    // TODO: Change state to selected https://github.com/zcash/ZcashLightClientKit/issues/696
                     Button("Back") { dump("Example button") }
                         .navigationButtonStyle
                         .frame(width: 80, height: 40)
 
-                    // TODO: Change state to selected
+                    // TODO: Change state to selected https://github.com/zcash/ZcashLightClientKit/issues/696
                     Button("Skip") { dump("Example button") }
                         .navigationButtonStyle
                         .frame(width: 80, height: 40)
diff --git a/secant/Utils/Previews.swift b/secant/Utils/Previews.swift
index f243d3c8..efd97a86 100644
--- a/secant/Utils/Previews.swift
+++ b/secant/Utils/Previews.swift
@@ -1,6 +1,6 @@
 import SwiftUI
 
-// TODO: This should have a #DEBUG tag, but if so, it's not possible to compile this on release mode and submit it to testflight
+// TODO: This should have a #DEBUG tag, but if so, it's not possible to compile this on release mode and submit it to testflight https://github.com/zcash/ZcashLightClientKit/issues/695
 struct StateContainer<T, Content: View>: View {
     @State private var state: T
     private var content: (Binding<T>) -> Content
diff --git a/secant/Utils/Strings.swift b/secant/Utils/Strings.swift
index aa4160e0..47d5585f 100644
--- a/secant/Utils/Strings.swift
+++ b/secant/Utils/Strings.swift
@@ -1,6 +1,6 @@
 import Foundation
 
-// TODO: This should have a #DEBUG tag, but if so, it's not possible to compile this on release mode and submit it to testflight
+// TODO: This should have a #DEBUG tag, but if so, it's not possible to compile this on release mode and submit it to testflight https://github.com/zcash/ZcashLightClientKit/issues/695
 extension String {
     init<T>(dumping value: T) {
         var output = String()