diff --git a/culminating-mastermind/app/src/main/java/mastermind/gui/scenes/CodeBreaker.java b/culminating-mastermind/app/src/main/java/mastermind/gui/scenes/CodeBreaker.java
index 8593288..8d5b597 100644
--- a/culminating-mastermind/app/src/main/java/mastermind/gui/scenes/CodeBreaker.java
+++ b/culminating-mastermind/app/src/main/java/mastermind/gui/scenes/CodeBreaker.java
@@ -17,7 +17,6 @@
 public class CodeBreaker extends Scene {
     private final MastermindAlgorithm solver;
     private final GameBoard gameBoard = new GameBoard();
-    private final HomeButton homeButton = new HomeButton();
     private final AtomicInteger correctCount = new AtomicInteger(2);
     private final AtomicInteger misplacementCount = new AtomicInteger(2);
     private final JButton proceedButton = new JButton("Proceed");
@@ -56,9 +55,9 @@ public CodeBreaker(final JFrame frame, final MastermindAlgorithm algorithm) {
 
         drawProceedButton();
 
-        homeButton.drawHomeButton(frame);
+        HomeButton.drawHomeButton(frame);
 
-        homeButton.registerHomeHandlers(frame);
+        HomeButton.registerHomeHandlers(frame);
 
         registerGuessHandler();
 
diff --git a/culminating-mastermind/app/src/main/java/mastermind/gui/scenes/CodeBreakerSelector.java b/culminating-mastermind/app/src/main/java/mastermind/gui/scenes/CodeBreakerSelector.java
index 7afc9c5..8fc8eb4 100644
--- a/culminating-mastermind/app/src/main/java/mastermind/gui/scenes/CodeBreakerSelector.java
+++ b/culminating-mastermind/app/src/main/java/mastermind/gui/scenes/CodeBreakerSelector.java
@@ -14,7 +14,6 @@ public class CodeBreakerSelector extends Scene {
     private final JRadioButton mediumAlgoButton = new JRadioButton("Medium Algorithm");
     private final JRadioButton basicAlgoButton = new JRadioButton("Basic Algorithm");
     private final JButton proceedButton = new JButton("Proceed");
-    private final HomeButton homeButton = new HomeButton();
 
     /**
      * Constructs a CodeBreakerSelector, which provides a user interface to select
@@ -37,9 +36,9 @@ public CodeBreakerSelector(final JFrame frame) {
 
         drawProceedButton();
 
-        homeButton.drawHomeButton(frame);
+        HomeButton.drawHomeButton(frame);
 
-        homeButton.registerHomeHandlers(frame);
+        HomeButton.registerHomeHandlers(frame);
 
         registerProceedHandler();
 
diff --git a/culminating-mastermind/app/src/main/java/mastermind/gui/scenes/CodeMaker.java b/culminating-mastermind/app/src/main/java/mastermind/gui/scenes/CodeMaker.java
index aadfd6e..6839a55 100644
--- a/culminating-mastermind/app/src/main/java/mastermind/gui/scenes/CodeMaker.java
+++ b/culminating-mastermind/app/src/main/java/mastermind/gui/scenes/CodeMaker.java
@@ -22,7 +22,6 @@ public class CodeMaker extends Scene {
     private final GameBoard gameBoard = new GameBoard();
     private final JButton proceedButton = new JButton("Proceed");
     private final JButton deleteButton = new JButton("Delete");
-    private final HomeButton homeButton = new HomeButton();
     private final JPanel flowPanel = new JPanel(new FlowLayout());
     private final JPanel controlPanel = new JPanel();
 
@@ -54,13 +53,13 @@ public CodeMaker(final JFrame frame) {
 
         drawProceedButton();
 
-        homeButton.drawHomeButton(frame);
+        HomeButton.drawHomeButton(frame);
 
         registerColorSelectionHandlers();
 
         registerDeleteHandlers();
 
-        homeButton.registerHomeHandlers(frame);
+        HomeButton.registerHomeHandlers(frame);
 
         registerProceedHandlers();