diff --git a/Classes/Base.lproj/DialerViewController.xib b/Classes/Base.lproj/DialerViewController.xib
index 5dfbb3f75..c941fd6ce 100644
--- a/Classes/Base.lproj/DialerViewController.xib
+++ b/Classes/Base.lproj/DialerViewController.xib
@@ -11,6 +11,7 @@
                 <outlet property="addContactButton" destination="222" id="225"/>
                 <outlet property="addressField" destination="4" id="205"/>
                 <outlet property="backButton" destination="183" id="d75-ly-K6w"/>
+                <outlet property="backspaceButton" destination="8dc-hj-rvt" id="6p9-p4-QAN"/>
                 <outlet property="callButton" destination="224" id="231"/>
                 <outlet property="eightButton" destination="35" id="204"/>
                 <outlet property="fiveButton" destination="31" id="195"/>
@@ -49,7 +50,7 @@
                                 <outlet property="delegate" destination="-1" id="190"/>
                             </connections>
                         </textField>
-                        <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" id="8dc-hj-rvt" userLabel="backspaceButton">
+                        <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" id="8dc-hj-rvt" userLabel="backspaceButton" customClass="UIIconButton">
                             <rect key="frame" x="300" y="0.0" width="60" height="63"/>
                             <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                             <state key="normal" image="backspace_default.png">
diff --git a/Classes/Base.lproj/InCallViewController.xib b/Classes/Base.lproj/InCallViewController.xib
index 0a1f91e92..a1b75e7bc 100644
--- a/Classes/Base.lproj/InCallViewController.xib
+++ b/Classes/Base.lproj/InCallViewController.xib
@@ -40,7 +40,7 @@
                             </accessibility>
                         </view>
                         <view contentMode="scaleAspectFit" id="127" userLabel="preview">
-                            <rect key="frame" x="244.00000014128503" y="378.99999962111264" width="108" height="150"/>
+                            <rect key="frame" x="244.00000028578108" y="378.99999942623742" width="108" height="150"/>
                             <autoresizingMask key="autoresizingMask" flexibleMinX="YES" widthSizable="YES" flexibleMinY="YES" heightSizable="YES"/>
                             <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
                         </view>
diff --git a/Classes/DialerViewController.h b/Classes/DialerViewController.h
index b85030b11..7205259ce 100644
--- a/Classes/DialerViewController.h
+++ b/Classes/DialerViewController.h
@@ -21,7 +21,6 @@
 
 #import "UICompositeViewController.h"
 
-#import "UIEraseButton.h"
 #import "UICamSwitch.h"
 #import "UICallButton.h"
 #import "UITransferButton.h"
@@ -42,7 +41,7 @@
 @property (nonatomic, strong) IBOutlet UICallButton* addCallButton;
 @property (nonatomic, strong) IBOutlet UITransferButton* transferButton;
 @property (nonatomic, strong) IBOutlet UIButton* backButton;
-@property (nonatomic, strong) IBOutlet UIEraseButton* eraseButton;
+@property(weak, nonatomic) IBOutlet UIIconButton *backspaceButton;
 
 @property (nonatomic, strong) IBOutlet UIDigitButton* oneButton;
 @property (nonatomic, strong) IBOutlet UIDigitButton* twoButton;
diff --git a/Classes/DialerViewController.m b/Classes/DialerViewController.m
index fbd51eb7a..267f6b8d8 100644
--- a/Classes/DialerViewController.m
+++ b/Classes/DialerViewController.m
@@ -39,7 +39,7 @@
 @synthesize addCallButton;
 @synthesize transferButton;
 @synthesize callButton;
-@synthesize eraseButton;
+@synthesize backspaceButton;
 
 @synthesize oneButton;
 @synthesize twoButton;
@@ -167,6 +167,18 @@ static UICompositeViewDescription *compositeDescription = nil;
 
 	[addressField setAdjustsFontSizeToFitWidth:TRUE]; // Not put it in IB: issue with placeholder size
 
+	UILongPressGestureRecognizer *backspaceLongGesture =
+		[[UILongPressGestureRecognizer alloc] initWithTarget:self action:@selector(onBackspaceLongClick:)];
+	[backspaceButton addGestureRecognizer:backspaceLongGesture];
+
+	UILongPressGestureRecognizer *zeroLongGesture =
+		[[UILongPressGestureRecognizer alloc] initWithTarget:self action:@selector(onZeroLongClick:)];
+	[zeroButton addGestureRecognizer:zeroLongGesture];
+
+	UILongPressGestureRecognizer *oneLongGesture =
+		[[UILongPressGestureRecognizer alloc] initWithTarget:self action:@selector(onOneLongClick:)];
+	[oneButton addGestureRecognizer:oneLongGesture];
+
 	if ([LinphoneManager runningOnIpad]) {
 		if ([LinphoneManager instance].frontCamId != nil) {
 			// only show camera switch button if we have more than 1 camera
@@ -414,18 +426,40 @@ static UICompositeViewDescription *compositeDescription = nil;
 	}
 	if ([[addressField text] length] > 0) {
 		[addContactButton setEnabled:TRUE];
-		[eraseButton setEnabled:TRUE];
+		[backspaceButton setEnabled:TRUE];
 		[addCallButton setEnabled:TRUE];
 		[transferButton setEnabled:TRUE];
 	} else {
 		[addContactButton setEnabled:FALSE];
-		[eraseButton setEnabled:FALSE];
+		[backspaceButton setEnabled:FALSE];
 		[addCallButton setEnabled:FALSE];
 		[transferButton setEnabled:FALSE];
 	}
 }
 
 - (IBAction)onBackspaceClick:(id)sender {
+	if ([addressField.text length] > 0) {
+		[addressField setText:[addressField.text substringToIndex:[addressField.text length] - 1]];
+	}
 }
 
+- (void)onBackspaceLongClick:(id)sender {
+	[addressField setText:@""];
+}
+
+- (void)onOneLongClick:(id)sender {
+	NSString *newAddress =
+		[[self.addressField.text substringToIndex:[self.addressField.text length] - 1] stringByAppendingString:@"+"];
+	[self.addressField setText:newAddress];
+}
+
+- (void)onZeroLongClick:(id)sender {
+	LinphoneManager *lm = [LinphoneManager instance];
+	NSString *voiceMail = [lm lpConfigStringForKey:@"voice_mail_uri"];
+	if (voiceMail != nil) {
+		[lm call:voiceMail displayName:NSLocalizedString(@"Voice mail", nil) transfer:FALSE];
+	} else {
+		LOGE(@"Cannot call voice mail because URI not set!");
+	}
+}
 @end
diff --git a/Classes/LinphoneUI/UIDigitButton.h b/Classes/LinphoneUI/UIDigitButton.h
index afd6ddc8f..9c94f4933 100644
--- a/Classes/LinphoneUI/UIDigitButton.h
+++ b/Classes/LinphoneUI/UIDigitButton.h
@@ -19,10 +19,9 @@
 
 #import <UIKit/UIKit.h>
 
-#import "UILongTouchButton.h"
+#import "UIIconButton.h"
 
-
-@interface UIDigitButton : UILongTouchButton {
+@interface UIDigitButton : UIIconButton {
 }
 
 @property (nonatomic, strong) IBOutlet UITextField* addressField;
diff --git a/Classes/LinphoneUI/UIDigitButtonLongPlus.h b/Classes/LinphoneUI/UIDigitButtonLongPlus.h
deleted file mode 100644
index f1cf5b3c9..000000000
--- a/Classes/LinphoneUI/UIDigitButtonLongPlus.h
+++ /dev/null
@@ -1,29 +0,0 @@
-
-/* UIDigitButton.h
- *
- * Copyright (C) 2011  Belledonne Comunications, Grenoble, France
- *
- *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2 of the License, or
- *  (at your option) any later version.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
- */
-
-#import <UIKit/UIKit.h>
-
-#import "UIDigitButton.h"
-
-
-@interface UIDigitButtonLongPlus : UIDigitButton {
-}
-
-@end
diff --git a/Classes/LinphoneUI/UIDigitButtonLongPlus.m b/Classes/LinphoneUI/UIDigitButtonLongPlus.m
deleted file mode 100644
index ee2ef55bb..000000000
--- a/Classes/LinphoneUI/UIDigitButtonLongPlus.m
+++ /dev/null
@@ -1,35 +0,0 @@
-/* UIDigitButton.m
- *
- * Copyright (C) 2011  Belledonne Comunications, Grenoble, France
- *
- *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2 of the License, or
- *  (at your option) any later version.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
- */
-
-#import "UIDigitButtonLongPlus.h"
-
-@implementation UIDigitButtonLongPlus
-
-#pragma mark - UILongTouchButtonDelegate Functions
-
-- (void)onRepeatTouch {
-}
-
-- (void)onLongTouch {
-	NSString *newAddress =
-		[[self.addressField.text substringToIndex:[self.addressField.text length] - 1] stringByAppendingString:@"+"];
-	[self.addressField setText:newAddress];
-}
-
-@end
diff --git a/Classes/LinphoneUI/UIDigitButtonLongVoiceMail.h b/Classes/LinphoneUI/UIDigitButtonLongVoiceMail.h
deleted file mode 100644
index 2bfaf7b64..000000000
--- a/Classes/LinphoneUI/UIDigitButtonLongVoiceMail.h
+++ /dev/null
@@ -1,35 +0,0 @@
-
-/* UIDigitButton.h
- *
- * Copyright (C) 2011  Belledonne Comunications, Grenoble, France
- *
- *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2 of the License, or
- *  (at your option) any later version.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
- */
-
-#import <UIKit/UIKit.h>
-
-#import "UIDigitButton.h"
-
-
-@interface UIDigitButtonLongVoiceMail : UIDigitButton {
-}
-
-/* Returns TRUE if voice mail is configured in LinphoneCore */
-- (BOOL) voiceMailEnabled;
-
-/*! Automatically chooses the right icon depending on voice mail configured or not */
-- (void) refreshUI;
-
-@end
diff --git a/Classes/LinphoneUI/UIDigitButtonLongVoiceMail.m b/Classes/LinphoneUI/UIDigitButtonLongVoiceMail.m
deleted file mode 100644
index 601646acd..000000000
--- a/Classes/LinphoneUI/UIDigitButtonLongVoiceMail.m
+++ /dev/null
@@ -1,57 +0,0 @@
-/* UIDigitButton.m
- *
- * Copyright (C) 2011  Belledonne Comunications, Grenoble, France
- *
- *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2 of the License, or
- *  (at your option) any later version.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
- */
-
-#import "UIDigitButtonLongVoiceMail.h"
-#import "Utils.h"
-#include "LinphoneManager.h"
-
-@implementation UIDigitButtonLongVoiceMail
-
-#pragma mark - UILongTouchButtonDelegate Functions
-
-- (void)onRepeatTouch {
-}
-
-- (void)onLongTouch {
-	if ([self voiceMailEnabled]) {
-		LinphoneManager *lm = [LinphoneManager instance];
-		[lm call:[lm lpConfigStringForKey:@"voice_mail_uri"]
-			displayName:NSLocalizedString(@"Voice mail", nil)
-			   transfer:FALSE];
-	}
-}
-
-- (BOOL)voiceMailEnabled {
-	NSString *voiceMailUri = [[LinphoneManager instance] lpConfigStringForKey:@"voice_mail_uri" withDefault:NULL];
-
-	return (voiceMailUri != NULL);
-}
-
-- (void)refreshUI {
-	NSString *name = @"numpad_one_";
-
-	if ([self voiceMailEnabled]) {
-		name = [name stringByAppendingString:@"voicemail_"];
-	}
-
-	[self setImage:[UIImage imageNamed:[name stringByAppendingString:@"default.png"]] forState:UIControlStateNormal];
-	[self setImage:[UIImage imageNamed:[name stringByAppendingString:@"over.png"]] forState:UIControlStateHighlighted];
-}
-
-@end
diff --git a/Classes/LinphoneUI/UILongTouchButton.h b/Classes/LinphoneUI/UILongTouchButton.h
deleted file mode 100644
index eb5ddb231..000000000
--- a/Classes/LinphoneUI/UILongTouchButton.h
+++ /dev/null
@@ -1,32 +0,0 @@
-/* UILongTouchButton.h
- *
- * Copyright (C) 2012  Belledonne Comunications, Grenoble, France
- *
- *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2 of the License, or   
- *  (at your option) any later version.                                 
- *                                                                      
- *  This program is distributed in the hope that it will be useful,     
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of      
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the       
- *  GNU Library General Public License for more details.                
- *                                                                      
- *  You should have received a copy of the GNU General Public License   
- *  along with this program; if not, write to the Free Software         
- *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
- */  
-
-#import <UIKit/UIKit.h>
-
-@protocol UILongTouchButtonDelegate 
--(void) onRepeatTouch;
--(void) onLongTouch;
-@end
-
-#import "UIIconButton.h"
-
-@interface UILongTouchButton : UIIconButton <UILongTouchButtonDelegate> {
-}
-
-@end
diff --git a/Classes/LinphoneUI/UILongTouchButton.m b/Classes/LinphoneUI/UILongTouchButton.m
deleted file mode 100644
index 6573702cb..000000000
--- a/Classes/LinphoneUI/UILongTouchButton.m
+++ /dev/null
@@ -1,94 +0,0 @@
-/* UILongTouchButton.h
- *
- * Copyright (C) 2012  Belledonne Comunications, Grenoble, France
- *
- *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2 of the License, or
- *  (at your option) any later version.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU Library General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
- */
-
-#import "UILongTouchButton.h"
-
-@implementation UILongTouchButton
-
-#pragma mark - Lifecycle Functions
-
-- (id)initUILongTouchButton {
-	[self addTarget:self action:@selector(___touchDown:) forControlEvents:UIControlEventTouchDown];
-	[self addTarget:self
-				  action:@selector(___touchUp:)
-		forControlEvents:UIControlEventTouchUpInside | UIControlEventTouchUpOutside];
-	return self;
-}
-
-- (id)init {
-	self = [super init];
-	if (self) {
-		if (!(self = [self initUILongTouchButton]))
-			return nil;
-	}
-	return self;
-}
-
-- (id)initWithFrame:(CGRect)frame {
-	self = [super initWithFrame:frame];
-	if (self) {
-		if (!(self = [self initUILongTouchButton]))
-			return nil;
-	}
-	return self;
-}
-
-- (id)initWithCoder:(NSCoder *)decoder {
-	self = [super initWithCoder:decoder];
-	if (self) {
-		if (!(self = [self initUILongTouchButton]))
-			return nil;
-	}
-	return self;
-}
-
-- (void)dealloc {
-	[self removeTarget:self action:@selector(___touchDown:) forControlEvents:UIControlEventTouchDown];
-	[self removeTarget:self
-				  action:@selector(___touchUp:)
-		forControlEvents:UIControlEventTouchUpInside | UIControlEventTouchUpOutside];
-}
-
-- (void)___touchDown:(id)sender {
-	[self performSelector:@selector(doLongTouch) withObject:nil afterDelay:0.5];
-}
-
-- (void)___touchUp:(id)sender {
-	[NSObject cancelPreviousPerformRequestsWithTarget:self selector:@selector(doLongTouch) object:nil];
-	[NSObject cancelPreviousPerformRequestsWithTarget:self selector:@selector(doRepeatTouch) object:nil];
-}
-
-- (void)doLongTouch {
-	[self onLongTouch];
-	[self onRepeatTouch];
-	[self performSelector:@selector(doRepeatTouch) withObject:nil afterDelay:0.1];
-}
-
-- (void)doRepeatTouch {
-	[self onRepeatTouch];
-	[self performSelector:@selector(doRepeatTouch) withObject:nil afterDelay:0.1];
-}
-
-- (void)onRepeatTouch {
-}
-
-- (void)onLongTouch {
-}
-
-@end
diff --git a/linphone.xcodeproj/project.pbxproj b/linphone.xcodeproj/project.pbxproj
index c73a82ef1..201508cad 100755
--- a/linphone.xcodeproj/project.pbxproj
+++ b/linphone.xcodeproj/project.pbxproj
@@ -54,7 +54,6 @@
 		22AF73C21754C0D100BE8398 /* libopus.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 22AF73C11754C0D000BE8398 /* libopus.a */; };
 		22B5EFA310CE50BD00777D97 /* AddressBookUI.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 22B5EFA210CE50BD00777D97 /* AddressBookUI.framework */; };
 		22B5F03510CE6B2F00777D97 /* AddressBook.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 22B5F03410CE6B2F00777D97 /* AddressBook.framework */; };
-		22BB1A69132FF16A005CD7AA /* UIEraseButton.m in Sources */ = {isa = PBXBuildFile; fileRef = 22BB1A68132FF16A005CD7AA /* UIEraseButton.m */; };
 		22C755601317E59C007BC101 /* UIBluetoothButton.m in Sources */ = {isa = PBXBuildFile; fileRef = 22C7555F1317E59C007BC101 /* UIBluetoothButton.m */; };
 		22D1B68112A3E0BE001AE361 /* libresolv.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 22D1B68012A3E0BE001AE361 /* libresolv.dylib */; };
 		22E0A822111C44E100B04932 /* AboutViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 22E0A81C111C44E100B04932 /* AboutViewController.m */; };
@@ -106,8 +105,6 @@
 		63058AE31B4E93B300EFAE36 /* tester_hosts in Resources */ = {isa = PBXBuildFile; fileRef = 63058AE11B4E93A100EFAE36 /* tester_hosts */; };
 		630CF5571AF7CE1500539F7A /* UITextField+DoneButton.m in Sources */ = {isa = PBXBuildFile; fileRef = 630CF5561AF7CE1500539F7A /* UITextField+DoneButton.m */; };
 		63158FAD1B468E0E00969917 /* ImageOptim.sh in Resources */ = {isa = PBXBuildFile; fileRef = 63158FAC1B468E0E00969917 /* ImageOptim.sh */; };
-		631C4FB119D2A8F2004BFE77 /* UIDigitButtonLongPlus.m in Sources */ = {isa = PBXBuildFile; fileRef = 631C4FB019D2A8F2004BFE77 /* UIDigitButtonLongPlus.m */; };
-		631C4FB719D2C3A6004BFE77 /* UIDigitButtonLongVoiceMail.m in Sources */ = {isa = PBXBuildFile; fileRef = 631C4FB619D2C3A6004BFE77 /* UIDigitButtonLongVoiceMail.m */; };
 		632DA24D1B43EE9400EB356A /* Utils.m in Sources */ = {isa = PBXBuildFile; fileRef = D35860D515B549B500513429 /* Utils.m */; };
 		632DA24E1B43EEEF00EB356A /* Utils.m in Sources */ = {isa = PBXBuildFile; fileRef = D35860D515B549B500513429 /* Utils.m */; };
 		634610061B61330300548952 /* UILabel+Boldify.m in Sources */ = {isa = PBXBuildFile; fileRef = 634610051B61330300548952 /* UILabel+Boldify.m */; };
@@ -279,7 +276,6 @@
 		D31B4B21159876C0002E6C72 /* UICompositeViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = D31B4B1F159876C0002E6C72 /* UICompositeViewController.m */; };
 		D31C9C98158A1CDF00756B45 /* UIHistoryCell.m in Sources */ = {isa = PBXBuildFile; fileRef = D31C9C97158A1CDE00756B45 /* UIHistoryCell.m */; };
 		D3211BB0159C4EF10098460B /* UIConferenceHeader.m in Sources */ = {isa = PBXBuildFile; fileRef = D3211BAE159C4EF00098460B /* UIConferenceHeader.m */; };
-		D32409C3158B49A600C8C119 /* UILongTouchButton.m in Sources */ = {isa = PBXBuildFile; fileRef = D32409C2158B49A600C8C119 /* UILongTouchButton.m */; };
 		D32460E6159D9AAD00BA7F3A /* UITransparentView.m in Sources */ = {isa = PBXBuildFile; fileRef = D32460E5159D9AAD00BA7F3A /* UITransparentView.m */; };
 		D326483815887D5200930C67 /* OrderedDictionary.m in Sources */ = {isa = PBXBuildFile; fileRef = D326483715887D5200930C67 /* OrderedDictionary.m */; };
 		D326483E1588950F00930C67 /* UICallBar.m in Sources */ = {isa = PBXBuildFile; fileRef = D326483C1588950F00930C67 /* UICallBar.m */; };
@@ -596,8 +592,6 @@
 		22AF73C11754C0D000BE8398 /* libopus.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libopus.a; path = "liblinphone-sdk/apple-darwin/lib/libopus.a"; sourceTree = "<group>"; };
 		22B5EFA210CE50BD00777D97 /* AddressBookUI.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AddressBookUI.framework; path = System/Library/Frameworks/AddressBookUI.framework; sourceTree = SDKROOT; };
 		22B5F03410CE6B2F00777D97 /* AddressBook.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AddressBook.framework; path = System/Library/Frameworks/AddressBook.framework; sourceTree = SDKROOT; };
-		22BB1A67132FF16A005CD7AA /* UIEraseButton.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = UIEraseButton.h; sourceTree = "<group>"; };
-		22BB1A68132FF16A005CD7AA /* UIEraseButton.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = UIEraseButton.m; sourceTree = "<group>"; };
 		22C7555E1317E59C007BC101 /* UIBluetoothButton.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = UIBluetoothButton.h; sourceTree = "<group>"; };
 		22C7555F1317E59C007BC101 /* UIBluetoothButton.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = UIBluetoothButton.m; sourceTree = "<group>"; };
 		22D1B68012A3E0BE001AE361 /* libresolv.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libresolv.dylib; path = usr/lib/libresolv.dylib; sourceTree = SDKROOT; };
@@ -665,10 +659,6 @@
 		630CF5551AF7CE1500539F7A /* UITextField+DoneButton.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "UITextField+DoneButton.h"; sourceTree = "<group>"; };
 		630CF5561AF7CE1500539F7A /* UITextField+DoneButton.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "UITextField+DoneButton.m"; sourceTree = "<group>"; };
 		63158FAC1B468E0E00969917 /* ImageOptim.sh */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.script.sh; name = ImageOptim.sh; path = Tools/ImageOptim.sh; sourceTree = "<group>"; };
-		631C4FAF19D2A8F2004BFE77 /* UIDigitButtonLongPlus.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = UIDigitButtonLongPlus.h; sourceTree = "<group>"; };
-		631C4FB019D2A8F2004BFE77 /* UIDigitButtonLongPlus.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = UIDigitButtonLongPlus.m; sourceTree = "<group>"; };
-		631C4FB519D2C3A6004BFE77 /* UIDigitButtonLongVoiceMail.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = UIDigitButtonLongVoiceMail.h; sourceTree = "<group>"; };
-		631C4FB619D2C3A6004BFE77 /* UIDigitButtonLongVoiceMail.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = UIDigitButtonLongVoiceMail.m; sourceTree = "<group>"; };
 		633E388219FFB0F400936D1C /* README.md */ = {isa = PBXFileReference; lastKnownFileType = net.daringfireball.markdown; path = README.md; sourceTree = "<group>"; };
 		634610041B61330300548952 /* UILabel+Boldify.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "UILabel+Boldify.h"; sourceTree = "<group>"; };
 		634610051B61330300548952 /* UILabel+Boldify.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "UILabel+Boldify.m"; sourceTree = "<group>"; };
@@ -863,8 +853,6 @@
 		D31C9C97158A1CDE00756B45 /* UIHistoryCell.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = UIHistoryCell.m; sourceTree = "<group>"; };
 		D3211BAD159C4EF00098460B /* UIConferenceHeader.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = UIConferenceHeader.h; sourceTree = "<group>"; };
 		D3211BAE159C4EF00098460B /* UIConferenceHeader.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = UIConferenceHeader.m; sourceTree = "<group>"; };
-		D32409C1158B49A600C8C119 /* UILongTouchButton.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = UILongTouchButton.h; sourceTree = "<group>"; };
-		D32409C2158B49A600C8C119 /* UILongTouchButton.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = UILongTouchButton.m; sourceTree = "<group>"; };
 		D32460E4159D9AAD00BA7F3A /* UITransparentView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = UITransparentView.h; sourceTree = "<group>"; };
 		D32460E5159D9AAD00BA7F3A /* UITransparentView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = UITransparentView.m; sourceTree = "<group>"; };
 		D326483615887D5200930C67 /* OrderedDictionary.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = OrderedDictionary.h; path = Utils/OrderedDictionary.h; sourceTree = "<group>"; };
@@ -1403,14 +1391,8 @@
 				D381881815FE3F7F00C3EDCA /* UIContactDetailsHeader.xib */,
 				2248E90C12F7E4CF00220D9C /* UIDigitButton.h */,
 				2248E90D12F7E4CF00220D9C /* UIDigitButton.m */,
-				631C4FAF19D2A8F2004BFE77 /* UIDigitButtonLongPlus.h */,
-				631C4FB019D2A8F2004BFE77 /* UIDigitButtonLongPlus.m */,
-				631C4FB519D2C3A6004BFE77 /* UIDigitButtonLongVoiceMail.h */,
-				631C4FB619D2C3A6004BFE77 /* UIDigitButtonLongVoiceMail.m */,
 				D3C6526515AC1A8F0092A874 /* UIEditableTableViewCell.h */,
 				D3C6526615AC1A8F0092A874 /* UIEditableTableViewCell.m */,
-				22BB1A67132FF16A005CD7AA /* UIEraseButton.h */,
-				22BB1A68132FF16A005CD7AA /* UIEraseButton.m */,
 				2214EB8712F84EBB002A5394 /* UIHangUpButton.h */,
 				2214EB8812F84EBB002A5394 /* UIHangUpButton.m */,
 				D31C9C96158A1CDE00756B45 /* UIHistoryCell.h */,
@@ -1426,8 +1408,6 @@
 				D35E91F3160CA10B0023116B /* UILinphoneTextField.m */,
 				D306459C1611EC2900BB571E /* UILoadingImageView.h */,
 				D306459D1611EC2900BB571E /* UILoadingImageView.m */,
-				D32409C1158B49A600C8C119 /* UILongTouchButton.h */,
-				D32409C2158B49A600C8C119 /* UILongTouchButton.m */,
 				D3ED3E841586291B006C0DE4 /* UIMainBar.h */,
 				D3ED3E851586291B006C0DE4 /* UIMainBar.m */,
 				D38187FB15FE355D00C3EDCA /* UIMainBar.xib */,
@@ -2483,7 +2463,6 @@
 				1D3623260D0F684500981E51 /* LinphoneAppDelegate.m in Sources */,
 				22F2508E107141E100AC9B3F /* DialerViewController.m in Sources */,
 				22E0A822111C44E100B04932 /* AboutViewController.m in Sources */,
-				631C4FB119D2A8F2004BFE77 /* UIDigitButtonLongPlus.m in Sources */,
 				634610061B61330300548952 /* UILabel+Boldify.m in Sources */,
 				2248E90E12F7E4CF00220D9C /* UIDigitButton.m in Sources */,
 				2214EB7A12F846B1002A5394 /* UICallButton.m in Sources */,
@@ -2493,7 +2472,6 @@
 				22968A5F12F875C600588287 /* UISpeakerButton.m in Sources */,
 				2218A92512FBE1340088A667 /* FirstLoginViewController.m in Sources */,
 				22C755601317E59C007BC101 /* UIBluetoothButton.m in Sources */,
-				22BB1A69132FF16A005CD7AA /* UIEraseButton.m in Sources */,
 				22AA8B0113D83F6300B30535 /* UICamSwitch.m in Sources */,
 				636BC9971B5F921B00C754CE /* UIIconButton.m in Sources */,
 				340751E7150F38FD00B89C47 /* UIVideoButton.m in Sources */,
@@ -2512,7 +2490,6 @@
 				D32648441588F6FC00930C67 /* UIToggleButton.m in Sources */,
 				D36FB2D51589EF7C0036F6F2 /* UIPauseButton.m in Sources */,
 				D31C9C98158A1CDF00756B45 /* UIHistoryCell.m in Sources */,
-				D32409C3158B49A600C8C119 /* UILongTouchButton.m in Sources */,
 				D36C43C6158F2E5A0048BA40 /* UICallCell.m in Sources */,
 				D35E7581159328EB0066B1C1 /* UIAddressTextField.m in Sources */,
 				D35E7597159460580066B1C1 /* ChatViewController.m in Sources */,
@@ -2565,7 +2542,6 @@
 				D3807FF615C2894A005BE9BC /* IASKSpecifier.m in Sources */,
 				D3807FF815C2894A005BE9BC /* IASKPSSliderSpecifierViewCell.m in Sources */,
 				D3807FFA15C2894A005BE9BC /* IASKPSTextFieldSpecifierViewCell.m in Sources */,
-				631C4FB719D2C3A6004BFE77 /* UIDigitButtonLongVoiceMail.m in Sources */,
 				D3807FFC15C2894A005BE9BC /* IASKPSTitleValueSpecifierViewCell.m in Sources */,
 				D3807FFE15C2894A005BE9BC /* IASKSlider.m in Sources */,
 				D380800015C2894A005BE9BC /* IASKSwitch.m in Sources */,