diff --git a/Classes/ConferenceCallDetailView.m b/Classes/ConferenceCallDetailView.m
index a8f47c07b..8d218efef 100644
--- a/Classes/ConferenceCallDetailView.m
+++ b/Classes/ConferenceCallDetailView.m
@@ -51,8 +51,8 @@ NSTimer *callQualityRefresher;
     
     table.rowHeight = 80;
     
-    [mute initWithOnImage:[UIImage imageNamed:@"micro_inverse.png"]  offImage:[UIImage imageNamed:@"micro.png"] ];
-    [speaker initWithOnImage:[UIImage imageNamed:@"HP_inverse.png"]  offImage:[UIImage imageNamed:@"HP.png"] ];
+    [mute initWithOnImage:[UIImage imageNamed:@"micro_inverse.png"]  offImage:[UIImage imageNamed:@"micro.png"] debugName:"MUTE button"];
+    [speaker initWithOnImage:[UIImage imageNamed:@"HP_inverse.png"]  offImage:[UIImage imageNamed:@"HP.png"] debugName:"SPEAKER button"];
 }
 
 -(void) backButtonPressed {
diff --git a/Classes/IncallViewController.m b/Classes/IncallViewController.m
index 3e5045437..c99f1b964 100644
--- a/Classes/IncallViewController.m
+++ b/Classes/IncallViewController.m
@@ -161,8 +161,8 @@ int callCount(LinphoneCore* lc) {
 - (void)viewDidLoad {
     [super viewDidLoad];
 	//Controls
-	[mute initWithOnImage:[UIImage imageNamed:@"micro_inverse.png"]  offImage:[UIImage imageNamed:@"micro.png"] ];
-    [speaker initWithOnImage:[UIImage imageNamed:@"HP_inverse.png"]  offImage:[UIImage imageNamed:@"HP.png"] ];
+	[mute initWithOnImage:[UIImage imageNamed:@"micro_inverse.png"]  offImage:[UIImage imageNamed:@"micro.png"] debugName:"MUTE button"];
+    [speaker initWithOnImage:[UIImage imageNamed:@"HP_inverse.png"]  offImage:[UIImage imageNamed:@"HP.png"] debugName:"SPEAKER button"];
     
     verified = [[UIImage imageNamed:@"secured.png"] retain];
     unverified = [[UIImage imageNamed:@"unverified.png"] retain];
diff --git a/Classes/LinphoneUI/UISpeakerButton.m b/Classes/LinphoneUI/UISpeakerButton.m
index 717025e00..10fdf5b5f 100644
--- a/Classes/LinphoneUI/UISpeakerButton.m
+++ b/Classes/LinphoneUI/UISpeakerButton.m
@@ -34,8 +34,8 @@ static void audioRouteChangeListenerCallback (
    
 }
 
--(void) initWithOnImage:(UIImage*) onImage offImage:(UIImage*) offImage {
-   [super initWithOnImage:onImage offImage:offImage];
+-(void) initWithOnImage:(UIImage*) onImage offImage:(UIImage*) offImage debugName:(const char *)name{
+   [super initWithOnImage:onImage offImage:offImage debugName:name];
    AudioSessionPropertyID routeChangeID = kAudioSessionProperty_AudioRouteChange;
    AudioSessionInitialize(NULL, NULL, NULL, NULL);
    OSStatus lStatus = AudioSessionAddPropertyListener(routeChangeID, audioRouteChangeListenerCallback, self);
diff --git a/Classes/LinphoneUI/UIToggleButton.h b/Classes/LinphoneUI/UIToggleButton.h
index b76550652..6e37990d0 100644
--- a/Classes/LinphoneUI/UIToggleButton.h
+++ b/Classes/LinphoneUI/UIToggleButton.h
@@ -30,10 +30,11 @@
 	UIImage* mOnImage;
 	UIImage* mOffImage;
 	bool mIsOn;
+    const char* debugName;
 	
 	
 }
--(void) initWithOnImage:(UIImage*) onImage offImage:(UIImage*) offImage;
+-(void) initWithOnImage:(UIImage*) onImage offImage:(UIImage*) offImage debugName:(const char*) name;
 -(bool) reset;
 -(bool) isOn;
 -(bool) toggle;
diff --git a/Classes/LinphoneUI/UIToggleButton.m b/Classes/LinphoneUI/UIToggleButton.m
index 04c0b3721..c6db043e3 100644
--- a/Classes/LinphoneUI/UIToggleButton.m
+++ b/Classes/LinphoneUI/UIToggleButton.m
@@ -17,7 +17,7 @@
  *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */       
 #import "UIToggleButton.h"
-
+#include "linphonecore.h"
 
 @implementation UIToggleButton
 
@@ -28,6 +28,8 @@
 	return mIsOn;
 }
 -(bool) toggle {
+    ms_message("UI - Toggle button '%s' state change %d -> %d",
+               debugName, mIsOn, !mIsOn);
 	if (mIsOn) {
 		[self setImage:mOffImage forState:UIControlStateNormal];
 		mIsOn=!mIsOn;
@@ -46,10 +48,11 @@
 	return mIsOn;
 }
 
--(void) initWithOnImage:(UIImage*) onImage offImage:(UIImage*) offImage {
+-(void) initWithOnImage:(UIImage*) onImage offImage:(UIImage*) offImage debugName:(const char *)name{
     mOnImage = [onImage retain];
     mOffImage = [offImage retain];
     mIsOn=false;
+    debugName = name;
 	[self reset];
 	[self addTarget:self action:@selector(touchUp:) forControlEvents:UIControlEventTouchUpInside];
 	
diff --git a/Classes/VideoViewController.m b/Classes/VideoViewController.m
index 424f0d118..c7b2febc7 100644
--- a/Classes/VideoViewController.m
+++ b/Classes/VideoViewController.m
@@ -78,9 +78,9 @@ NSTimer *callQualityRefresher;
 - (void)viewDidLoad
 {
     [super viewDidLoad];
-	[mMute initWithOnImage:[UIImage imageNamed:@"micro_inverse.png"]  offImage:[UIImage imageNamed:@"micro.png"] ];
-	[mMuteLandRight initWithOnImage:[UIImage imageNamed:@"micro_inverse.png"]  offImage:[UIImage imageNamed:@"micro.png"] ];
-	[mMuteLandLeft initWithOnImage:[UIImage imageNamed:@"micro_inverse.png"]  offImage:[UIImage imageNamed:@"micro.png"] ];
+	[mMute initWithOnImage:[UIImage imageNamed:@"micro_inverse.png"]  offImage:[UIImage imageNamed:@"micro.png"] debugName:"MUTE button"];
+	[mMuteLandRight initWithOnImage:[UIImage imageNamed:@"micro_inverse.png"]  offImage:[UIImage imageNamed:@"micro.png"] debugName:"MUTE2 button"];
+	[mMuteLandLeft initWithOnImage:[UIImage imageNamed:@"micro_inverse.png"]  offImage:[UIImage imageNamed:@"micro.png"] debugName:"MUTE3 button"];
 	[mCamSwitch setPreview:mPreview];
 	[mCamSwitchLandRight setPreview:mPreviewLandRight];
 	[mCamSwitchLandLeft setPreview:mPreviewLandLeft];