diff --git a/Sources/epoch_code/customs/images/Epad.paa b/Sources/epoch_code/customs/images/Epad.paa
new file mode 100644
index 00000000..5b0c7c71
Binary files /dev/null and b/Sources/epoch_code/customs/images/Epad.paa differ
diff --git a/Sources/epoch_code/gui/scripts/e_pad/EPOCH_EPad_dialog.sqf b/Sources/epoch_code/gui/scripts/e_pad/EPOCH_EPad_dialog.sqf
index 11773f58..f4b3c68d 100644
--- a/Sources/epoch_code/gui/scripts/e_pad/EPOCH_EPad_dialog.sqf
+++ b/Sources/epoch_code/gui/scripts/e_pad/EPOCH_EPad_dialog.sqf
@@ -157,4 +157,4 @@ if (_animate) then {
 		_display displayCtrl _x ctrlcommit 0.5;
 	} foreach [1614,1615,1714,1715];
 };
-ctrlSetFocus (_display displayctrl 1600);
+ctrlSetFocus (_display displayctrl 1599);
diff --git a/Sources/epoch_config/Configs/CfgActionMenu/CfgActionMenu_map.hpp b/Sources/epoch_config/Configs/CfgActionMenu/CfgActionMenu_map.hpp
index 64ca42ae..6f4a7f04 100644
--- a/Sources/epoch_config/Configs/CfgActionMenu/CfgActionMenu_map.hpp
+++ b/Sources/epoch_config/Configs/CfgActionMenu/CfgActionMenu_map.hpp
@@ -12,7 +12,8 @@
     Github:
     https://github.com/EpochModTeam/Epoch/tree/release/Sources/epoch_config/Configs/CfgActionMenu/CfgActionMenu_map.hpp
 */
-
+/*
+// Moved to E-Pad
 class playerMarker_on
 {
 	condition = "!EPOCH_PlayerMarkerOn";
@@ -41,3 +42,4 @@ class deathMarker_off
 	icon = "x\addons\a3_epoch_community\icons\skull.paa";
 	tooltip = "Toggle OFF death marker";
 };
+*/
\ No newline at end of file
diff --git a/Sources/epoch_config/Configs/CfgActionMenu/CfgActionMenu_self.hpp b/Sources/epoch_config/Configs/CfgActionMenu/CfgActionMenu_self.hpp
index 987836b7..82465e33 100644
--- a/Sources/epoch_config/Configs/CfgActionMenu/CfgActionMenu_self.hpp
+++ b/Sources/epoch_config/Configs/CfgActionMenu/CfgActionMenu_self.hpp
@@ -269,3 +269,10 @@ class geiger_menu
 		tooltip = "Unmute warnings";
 	};
 };
+class Epad
+{
+	condition = "EPOCH_EpadButtonOn";
+	action = "if (isnull (finddisplay 9898)) then {createdialog 'epoch_tablet_gui';};";
+	icon = "epoch_code\customs\images\Epad.paa";
+	tooltip = "E-Pad";
+};
\ No newline at end of file
diff --git a/Sources/epoch_config/Configs/CfgEPad.hpp b/Sources/epoch_config/Configs/CfgEPad.hpp
index c88823d3..8aaf3225 100644
--- a/Sources/epoch_config/Configs/CfgEPad.hpp
+++ b/Sources/epoch_config/Configs/CfgEPad.hpp
@@ -4,7 +4,8 @@ class e_pad_config
 		{"EPOCH_AutoEarplug","true"},
 		{"EPOCH_debugMode","false"},
 		{"EPOCH_PlayerMarkerOn","false"},
-		{"EPOCH_DeathMarkerOn","false"}
+		{"EPOCH_DeathMarkerOn","false"},
+		{"EPOCH_EpadButtonOn","true"}
 	};
 	class Apps
 	{
@@ -41,6 +42,17 @@ class e_pad_config
 			Tooltip = "Settings";
 			ToggleVar = "";
 			ToggleAble = "false";
+			class EpadButton {
+				ButtonText = "";
+				Description = "Epad Dyna";
+				Icon = "epoch_code\customs\images\epoch_tablet_back.paa";
+				color[] = {1,0,0,1};
+				colortoggled[] = {0,1,0,1};
+				action = "";
+				Tooltip = "Add / Remove E-Pad Button from DynaMenu (you can still open it with F10)";
+				ToggleVar = "EPOCH_EpadButtonOn";
+				ToggleAble = "true";
+			};
 			class Reset {
 				ButtonText = "Reset";
 				Description = "Reset Settings";
diff --git a/Sources/epoch_config/Configs/CfgEPad_dialogs.hpp b/Sources/epoch_config/Configs/CfgEPad_dialogs.hpp
index 7658707b..0db19ab5 100644
--- a/Sources/epoch_config/Configs/CfgEPad_dialogs.hpp
+++ b/Sources/epoch_config/Configs/CfgEPad_dialogs.hpp
@@ -548,6 +548,16 @@ class epoch_tablet_gui
 			w = 0.635763 * safezoneW;
 			h = 0.80322 * safezoneH;
 		};
+		class Spacer: RscButtonPDATrans
+		{
+			idc = 1599;
+			x = 0 * safezoneW + safezoneX;
+			y = 0 * safezoneH + safezoneY;
+			w = 0 * safezoneW;
+			h = 0 * safezoneH;
+			action = "";
+			tooltip = "";
+		};
 		class close: RscButtonPDATrans
 		{
 			idc = 1600;