diff --git a/epydial/data/themes/default/dialer_incall.edc b/epydial/data/themes/default/dialer_incall.edc
index 452322b..cfc6d98 100644
--- a/epydial/data/themes/default/dialer_incall.edc
+++ b/epydial/data/themes/default/dialer_incall.edc
@@ -3,10 +3,10 @@
 //
 // TODO: make the font colors shinier :)
 //
-// Signal1: "dialer_send"
-//  Parameter1.1: $"keynumber"
-//  Parameter1.2: "backspace"
-//  Parameter1.2: "dial"
+// Signal1: "dialer_incall_send"
+//  Parameter1.1: "End Call"
+//  Parameter1.2: "Back To Dialer"
+//  Parameter1.2: "Hold Call"
 
 data {
 	item: "author" "thomasg [thomas (a) gstaedtner (.) net]";
@@ -120,7 +120,7 @@ program { \
 	name: "button_"button_number"_signal_emit"; \
 	signal: "mouse,down,*"; \
 	source: "button_"button_number; \
-	action: SIGNAL_EMIT "dialer_send" button_caption; \
+	action: SIGNAL_EMIT "dialer_incall_send" button_caption; \
 } \
 program { \
 	name: "button_"button_number"_animation"; \
diff --git a/epydial/data/themes/default/dialer_incall.edj b/epydial/data/themes/default/dialer_incall.edj
index 6ca896c..f8f99e0 100644
Binary files a/epydial/data/themes/default/dialer_incall.edj and b/epydial/data/themes/default/dialer_incall.edj differ
diff --git a/epydial/epydial.py b/epydial/epydial.py
index 39cba9e..4436818 100755
--- a/epydial/epydial.py
+++ b/epydial/epydial.py
@@ -62,6 +62,12 @@ class InCallScreen(EdjeGroup):
 
 	def register_pyneo_callbacks(self):
 		pass
+		
+	@edje.decorators.signal_callback("dialer_incall_send", "*")
+	def on_edje_signal_dialer_incall_triggered(self, emission, source):
+		if source == "End Call":
+			print source
+			PyneoController.gsm_hangup()
 
 class MainScreen(EdjeGroup):
 	text = None
@@ -122,7 +128,7 @@ class MainScreen(EdjeGroup):
 				self.part_text_set("numberdisplay_text", "".join(self.text))
 			elif source == "dial":
 				PyneoController.gsm_dial("".join(self.text))
-
+				
 
 class PyneoController(object):
 	_dbus_timer = None
@@ -246,7 +252,7 @@ class PyneoController(object):
 		class_.notify_callbacks("gsm_dialing")
 
 	@classmethod
-	def gsm_hangup(class_, number):
+	def gsm_hangup(class_):
 		# Find call with highest "active call" counter - it'll be the one currently active
 		call = None
 		highest = 0