diff --git a/__resource.lua b/__resource.lua
index b2a39070..f7a49666 100644
--- a/__resource.lua
+++ b/__resource.lua
@@ -14,6 +14,7 @@ server_scripts {
 	'locales/fr.lua',
 	'locales/es.lua',
 	'locales/sv.lua',
+	'locales/pl.lua',
 	'server/main.lua'
 }
 
@@ -26,6 +27,7 @@ client_scripts {
 	'locales/fr.lua',
 	'locales/es.lua',
 	'locales/sv.lua',
+	'locales/pl.lua',
 	'client/main.lua'
 }
 
diff --git a/html/css/app.css b/html/css/app.css
index 061b08e5..d02ccc9c 100644
--- a/html/css/app.css
+++ b/html/css/app.css
@@ -33,7 +33,7 @@ html, body {
 	height: 480px;
 	color: #212121;
 	position: absolute;
-	right: 300px;
+	right: 50px;
 	bottom: 0;
 	overflow: hidden;
 	cursor: default;
diff --git a/html/scripts/app_de.js b/html/scripts/app_de.js
index fa6bb6a7..5643ea02 100644
--- a/html/scripts/app_de.js
+++ b/html/scripts/app_de.js
@@ -7,7 +7,10 @@
 					'<span class="sender">{{sender}}</span><br/><span class="phone-number">#{{phoneNumber}}</span>' +
 				'</div>' +
 			'</div>' +
-			'<div class="actions"><span class="new-msg newMsg-btn" data-contact-number="{{phoneNumberData}}" data-contact-name="{{senderData}}"></span></div>' +
+			'<div class="actions">' +
+				'<span class="del-contact" data-contact-number="{{phoneNumberData}}" data-contact-name="{{senderData}}">X</span>' +
+				'<span class="new-msg newMsg-btn" data-contact-number="{{phoneNumberData}}" data-contact-name="{{senderData}}"></span>' +
+			'</div>' +
 		'</div>'
 	;
 	
@@ -120,6 +123,16 @@
 		
 		$('#phone #repertoire .repertoire-list').html(contactHTML);
 	
+		$('.contact .del-contact').click(function() {
+			let name = $(this).attr('data-contact-name');
+			let phoneNumber = $(this).attr('data-contact-number');
+
+			$.post('http://esx_phone/remove_contact', JSON.stringify({
+				contactName: name,
+				phoneNumber: phoneNumber
+			}))
+		});
+
 		$('.contact.online .new-msg').click(function() {
 			showNewMessage($(this).attr('data-contact-number'), $(this).attr('data-contact-name'));
 		});
@@ -451,6 +464,10 @@
 			hideAddContact();
 		}
 
+		if(data.contactRemoved === true){
+			reloadPhone(data.phoneData);
+		}
+		
 		if(data.addSpecialContact === true){
 			addSpecialContact(data.name, data.number, data.base64Icon);
 		}
diff --git a/html/scripts/app_en.js b/html/scripts/app_en.js
index 36515331..21a3caf0 100644
--- a/html/scripts/app_en.js
+++ b/html/scripts/app_en.js
@@ -7,7 +7,10 @@
 					'<span class="sender">{{sender}}</span><br/><span class="phone-number">#{{phoneNumber}}</span>' +
 				'</div>' +
 			'</div>' +
-			'<div class="actions"><span class="new-msg newMsg-btn" data-contact-number="{{phoneNumberData}}" data-contact-name="{{senderData}}"></span></div>' +
+			'<div class="actions">' +
+				'<span class="del-contact" data-contact-number="{{phoneNumberData}}" data-contact-name="{{senderData}}">X</span>' +
+				'<span class="new-msg newMsg-btn" data-contact-number="{{phoneNumberData}}" data-contact-name="{{senderData}}"></span>' +
+			'</div>' +
 		'</div>'
 	;
 	
@@ -119,6 +122,16 @@
 		}
 		
 		$('#phone #repertoire .repertoire-list').html(contactHTML);
+
+		$('.contact .del-contact').click(function() {
+			let name = $(this).attr('data-contact-name');
+			let phoneNumber = $(this).attr('data-contact-number');
+
+			$.post('http://esx_phone/remove_contact', JSON.stringify({
+				contactName: name,
+				phoneNumber: phoneNumber
+			}))
+		});
 	
 		$('.contact.online .new-msg').click(function() {
 			showNewMessage($(this).attr('data-contact-number'), $(this).attr('data-contact-name'));
@@ -383,7 +396,7 @@
 	});
 	
 	$('#btn-head-new-message').click(function() {
-		showNewMessage('', 'Nouveau message');
+		showNewMessage('', 'New message');
 	});
 	
 	$('#btn-head-new-contact').click(function() {
@@ -451,6 +464,10 @@
 			hideAddContact();
 		}
 
+		if(data.contactRemoved === true){
+			reloadPhone(data.phoneData);
+		}
+		
 		if(data.addSpecialContact === true){
 			addSpecialContact(data.name, data.number, data.base64Icon);
 		}
diff --git a/html/scripts/app_pl.js b/html/scripts/app_pl.js
new file mode 100644
index 00000000..a29efe00
--- /dev/null
+++ b/html/scripts/app_pl.js
@@ -0,0 +1,512 @@
+(function(){
+	
+	let ContactTpl = 
+		'<div class="contact {{online}}">' +
+			'<div class="sender-info">' +
+				'<div class="center">' +
+					'<span class="sender">{{sender}}</span><br/><span class="phone-number">#{{phoneNumber}}</span>' +
+				'</div>' +
+			'</div>' +
+			'<div class="actions">' +
+				'<span class="del-contact" data-contact-number="{{phoneNumberData}}" data-contact-name="{{senderData}}">X</span>' +
+				'<span class="new-msg newMsg-btn" data-contact-number="{{phoneNumberData}}" data-contact-name="{{senderData}}"></span>' +
+			'</div>' +
+		'</div>'
+	;
+	
+	let MessageTpl = 
+		'<div class="message">' +
+			'<div class="sender-info">' +
+				'<div class="center">' +
+					'<span class="sender">{{sender}}</span><br/><span class="phone-number">#{{phoneNumber}}</span>' +
+				'</div>' + 
+			'</div>' + 
+			'<div class="body">{{message}}</div>' + 
+			'<div class="actions"><span class="new-msg {{anonyme}} reply-btn" data-contact-number="{{phoneNumberData}}" data-contact-name="{{senderData}}"></span><span class="gps {{activeGPS}} gps-btn" data-gpsX="{{gpsLocationX}}" data-gpsY="{{gpsLocationY}}"></span><span class="ok-btn {{showOK}}" data-contact-number="{{okNumberData}}" data-contact-job="{{jobData}}"></span></div>' +
+		'</div>'
+	;
+
+	let SpecialContactTpl = '<li class="phone-icon" style="background-image: url(\'{{base64Icon}}\');" data-number="{{number}}" data-name="{{name}}">{{name}}</li>';
+
+	let contacts            = [];
+	let specialContacts     = [];
+	let menu                = [];
+	let currentItem         = 0;
+	let currentVal          = null;
+	let isMessageEditorOpen = false;
+	let isMessagesOpen      = false;
+	let isPhoneShowed       = false;
+	
+	let showMain = function() {
+		$('.screen').removeClass('active');
+		$('.screen *').attr('disabled', 'disabled');
+	}
+	
+	let showRepertoire = function() {
+		$('#repertoire').addClass('active');
+	}
+	
+	let hideRepertoire = function() {
+		$('#repertoire').removeClass('active');
+	}
+	
+	let showMessages = function(){	
+		$('#messages').addClass('active');
+		isMessagesOpen = true;
+	}
+
+	let hideMessages = function(){		
+		$('#messages').removeClass('active');
+		isMessagesOpen = false;
+	}
+	
+	let showAddContact = function() {
+		$('#contact').addClass('active');
+		$('.screen *').attr('disabled', 'disabled');
+		$('.screen.active *').removeAttr('disabled');
+	}
+	
+	let hideAddContact = function() {
+		$('#contact').removeClass('active');
+		$('#contact_name').val('');
+		$('#contact_number').val('');
+	}
+	
+	let showNewMessage = function(cnum, cname) {
+		$('#writer').addClass('active');
+		$('#writer_number').val(cnum);
+		$('#writer .header-title').html(cname);
+		$('.screen *').attr('disabled', 'disabled');
+		$('.screen.active *').removeAttr('disabled');
+	}
+
+	let hideNewMessage = function() {		
+		$('#writer').removeClass('active');
+		$('#writer_number').val('');
+		$('#writer_message').val('');
+		$('#writer .header-title').html('');
+	}
+	
+	let showGPS = function(xPos, yPos) {
+		$.post('http://esx_phone/setGPS', JSON.stringify({
+			x: parseFloat(xPos),
+			y: parseFloat(yPos)
+		}
+		));
+	}
+
+	let renderContacts = function(){
+		
+		let contactHTML = '';
+		
+		if(contacts.length > 0) {
+
+			for(let i=0; i<contacts.length; i++) {
+				
+				let view = {
+					phoneNumber    : contacts[i].value,
+					sender         : contacts[i].label,
+					phoneNumberData: contacts[i].value,
+					senderData     : contacts[i].label,
+					online         : contacts[i].online  ? 'online' : '',
+					anonyme        : contacts[i].anonyme ? 'online' : ''
+				}
+
+				let html = Mustache.render(ContactTpl, view);
+
+				contactHTML += html;
+			}
+
+		} else {
+			contactHTML = '<div class="contact no-item online"><p class="no-item">Brak Kontaktów</p></div>';
+		}
+		
+		$('#phone #repertoire .repertoire-list').html(contactHTML);
+
+		$('.contact .del-contact').click(function() {
+			let name = $(this).attr('data-contact-name');
+			let phoneNumber = $(this).attr('data-contact-number');
+
+			$.post('http://esx_phone/remove_contact', JSON.stringify({
+				contactName: name,
+				phoneNumber: phoneNumber
+			}))
+		});
+	
+		$('.contact.online .new-msg').click(function() {
+			showNewMessage($(this).attr('data-contact-number'), $(this).attr('data-contact-name'));
+		});
+		
+	}
+	
+	$('.contact.online .new-msg').click(function() {
+		showNewMessage($(this).attr('data-contact-number'));
+	});
+
+	let reloadPhone = function(phoneData){
+
+		contacts = [];
+
+		for(let i=0; i<phoneData.contacts.length; i++){
+			contacts.push({
+				label : phoneData.contacts[i].name,
+				value : phoneData.contacts[i].number,
+				online: phoneData.contacts[i].online
+			})
+		}
+
+		renderContacts();
+
+		$('#phone-number').text('#' + phoneData.phoneNumber);
+	}
+
+	let showPhone = function(phoneData){
+		reloadPhone(phoneData);
+		$('#phone').show();
+		showMain();
+		isPhoneShowed = true;
+	}
+
+	let hidePhone = function(){		
+		$('#phone').hide();
+		isPhoneShowed = false;
+	}
+	
+	let messages = [];
+
+	let addMessage = function(phoneNumber, pmessage, pposition, panonyme, pjob){
+		
+		messages.push({
+			value   : phoneNumber,
+			message : pmessage,
+			position: pposition,
+			anonyme : panonyme,
+			job     : pjob
+		})
+
+		let messageHTML = '';
+		
+		if(messages.length >  0) {
+			
+			for(let i=0; i<messages.length; i++) {
+
+				let fromName   = "Unknown";
+				let fromNumber = messages[i].value;
+				let anonyme    = null;
+				
+				if(messages[i].job != "player")
+					fromName = messages[i].job;
+
+				if(messages[i].anonyme) {
+					
+					if(messages[i].job == "player")
+						fromName = "Anonymous";
+
+					fromNumber = "Anonymous";
+					anonyme    = 'anonyme';
+
+				} else {
+
+					for(let j=0; j<contacts.length; j++)
+						if(contacts[j].value == messages[i].value)
+							if(messages[i].job == "player")
+								fromName = contacts[j].label;
+
+					anonyme = '';
+				}
+				
+				let view = {
+					anonyme        : anonyme,
+					phoneNumber    : fromNumber,
+					sender         : fromName,
+					message        : messages[i].message,
+					phoneNumberData: fromNumber,
+					senderData     : fromName,
+					okNumberData   : fromNumber,
+					gpsLocationX   : (messages[i].job == 'player') ? '' : messages[i].position.x,
+					gpsLocationY   : (messages[i].job == 'player') ? '' : messages[i].position.y,
+					activeGPS      : (messages[i].job == 'player') ? '' : (messages[i].position) ? 'active' : '',
+					jobData        : (messages[i].job == 'player') ? '' : messages[i].job,
+					showOK         : (messages[i].job == 'player') ? '' : 'showOK'
+				}
+				
+				let html = Mustache.render(MessageTpl, view);
+
+				messageHTML = html + messageHTML;
+			}
+		} else {
+			messageHTML = '<div class="message no-item"><p class="no-item">Brak wiadomości</p></div>';
+		}
+		
+		$('#phone #messages .messages-list').html(messageHTML);
+		
+		$('.message .new-msg').click(function() {
+			showNewMessage($(this).attr('data-contact-number'), $(this).attr('data-contact-name'));
+		});
+		
+		$('.message .gps').click(function() {
+			showGPS($(this).attr('data-gpsX'), $(this).attr('data-gpsY'));
+		});
+		
+		$('.message .ok-btn').click(function() {
+			$.post('http://esx_phone/send', JSON.stringify({
+				message: $(this).attr('data-contact-job') + ": Otrzymane!",
+				number : $(this).attr('data-contact-number'),
+				anonyme: false
+			}))
+		});
+	}
+
+	let scrollMessages = function(direction){
+
+		let element = $('#messages .container')[0];
+
+		if(direction == 'UP')
+			element.scrollTop -= 100;
+
+		if(direction == 'DOWN')
+			element.scrollTop += 100;
+	}
+
+	let addSpecialContact = function(name, number, base64Icon){
+		
+		let found = false
+
+		for(let i=0; i<specialContacts.length; i++)
+			if(specialContacts[i].number == number)
+				found = true;
+
+		if(!found){
+
+			specialContacts.push({
+				name      : name,
+				number    : number,
+				base64Icon: base64Icon
+			});
+
+			specialContacts.sort((a,b) => {
+				return a.name.localeCompare(b.name);
+			});
+
+			renderSpecialContacts();
+
+		}
+
+	}
+
+	let removeSpecialContact = function(number){
+
+		for(let i=0; i<specialContacts.length; i++){
+			if(specialContacts[i].number == number){
+				specialContacts.splice(i, 1);
+				break;
+			}
+		}
+
+		renderSpecialContacts();
+
+	}
+
+	let renderSpecialContacts = function(){
+
+		$('.phone-icon').unbind('click');
+
+		$('#phone .menu .home').html(
+			'<li class="phone-icon" id="phone-icon-rep">Kontakty</li>' +
+			'<li class="phone-icon" id="phone-icon-msg">Wiadomości</li>'
+		);
+
+		for(let i=0; i<specialContacts.length; i++){
+			let elem = $(Mustache.render(SpecialContactTpl, specialContacts[i]));
+			$('#phone .menu .home').append(elem);
+		}
+
+		$('.phone-icon').click(function(event) {
+
+			let id = $(this).attr('id');
+
+			switch(id) {
+
+				case 'phone-icon-rep' : {
+					showRepertoire();
+					break;
+				}
+
+				case 'phone-icon-msg' : {
+					showMessages();
+					break;
+				}
+
+				default : {
+					
+					let number = $(this).data('number');
+					let name   = $(this).data('name');
+
+					showNewMessage(number, name);
+
+					break;
+				}
+			}
+
+		});
+	}
+
+	$('#writer_send').click(function(){
+		
+		let phoneNumber = null
+		
+		if(typeof $('#writer_number').val() == 'number')
+			phoneNumber = parseInt($('#writer_number').val());
+		else if (typeof $('#writer_number').val() == 'string')
+			phoneNumber = $('#writer_number').val();
+
+		$.post('http://esx_phone/send', JSON.stringify({
+			message: $('#writer_message').val(),
+			number : phoneNumber,
+			anonyme: $('#writer_anonyme').is(':checked')
+		}))
+
+	});
+
+	$('#contact_send').click(function(){
+
+		$.post('http://esx_phone/add_contact', JSON.stringify({
+			contactName: $('#contact_name').val(),
+			phoneNumber: $('#contact_number').val()
+		}))
+
+	});
+
+	// ACTIONS BTNS
+	$('#btn-head-back-msg').click(function() {
+		hideNewMessage();
+		hideMessages();
+	});
+	
+	$('#btn-head-back-rep').click(function() {
+		hideRepertoire();
+	});
+	
+	$('#btn-head-back-writer, #writer_cancel').click(function() {
+		hideNewMessage();
+	});
+	
+	$('#btn-head-back-contact, #contact_cancel').click(function() {
+		hideAddContact();
+	});
+	
+	$('#btn-head-new-message').click(function() {
+		showNewMessage('', 'Nowa wiadomosc');
+	});
+	
+	$('#btn-head-new-contact').click(function() {
+		showAddContact();
+	});
+
+	$('.phone-icon').click(function(event) {
+
+		let id = $(this).attr('id');
+
+		switch(id) {
+
+			case 'phone-icon-rep' : {
+				showRepertoire();
+				break;
+			}
+
+			case 'phone-icon-msg' : {
+				showMessages();
+				break;
+			}
+
+			default : {
+				
+				let number = $(this).data('number');
+				let name   = $(this).data('name');
+
+				showNewMessage(number, name);
+
+				break;
+			}
+		}
+
+	});
+
+	window.onData = function(data){
+
+		if(data.scroll === true){
+			if(isMessagesOpen)
+				scrollMessages(data.direction);
+		}
+
+		if(data.reloadPhone === true){
+			reloadPhone(data.phoneData);
+		}
+
+		if(data.showPhone === true){
+			showPhone(data.phoneData);
+		}
+
+		if(data.showPhone === false){
+			hidePhone();
+		}
+
+		if(data.showMessageEditor === false){
+			hideNewMessage();
+		}
+
+		if(data.newMessage === true){
+			addMessage(data.phoneNumber, data.message, data.position, data.anonyme, data.job);
+		}
+
+		if(data.contactAdded === true){
+			reloadPhone(data.phoneData);
+			hideAddContact();
+		}
+
+		if(data.contactRemoved === true){
+			reloadPhone(data.phoneData);
+		}
+		
+		if(data.addSpecialContact === true){
+			addSpecialContact(data.name, data.number, data.base64Icon);
+		}
+
+		if(data.removeSpecialContact === true){
+			removeSpecialContact(data.number);
+		}
+
+		if(data.move && isPhoneShowed){
+
+			if(data.move == 'UP'){
+				scroll('UP');
+			}
+
+			if(data.move == 'DOWN'){
+				scroll('DOWN');
+			}
+		}
+
+		if(data.enterPressed){
+
+			if(isPhoneShowed) {
+
+				$.post('http://esx_phone/select', JSON.stringify({
+					val  : currentVal
+				}));
+
+			}
+
+		}
+
+	}
+
+	window.onload = function(e){ window.addEventListener('message', function(event){ onData(event.data) }); }
+
+	document.onkeydown = function (data) {
+		if ((data.which == 120 || data.which == 27) && isPhoneShowed) { // || data.which == 8
+			$.post('http://esx_phone/escape');
+		}
+	};
+
+})();
diff --git a/html/ui_pl.html b/html/ui_pl.html
new file mode 100644
index 00000000..0d731437
--- /dev/null
+++ b/html/ui_pl.html
@@ -0,0 +1,82 @@
+<html>
+	<head>
+		<meta charset="utf-8"/>
+		<link rel="stylesheet" href="css/app.css" type="text/css" />
+		<link href="https://fonts.googleapis.com/css?family=Catamaran:400,700" rel="stylesheet">
+	</head>
+	<body>
+
+		<div class="phone" id="phone">
+
+			<div class="container">
+
+				<div class="head">
+					<span id="phone-icon"><img src="./img/icons/signal.png" /></span>
+					<span id="phone-number">#123456</span>
+				</div>
+
+				<div class="menu">
+					<ul class="home">
+						<li class="phone-icon" id="phone-icon-rep">Kontakty</li>
+						<li class="phone-icon" id="phone-icon-msg">Wiadomości</li>
+					</ul>
+				</div>
+
+				<div id="repertoire" class="screen">
+
+				<div class="head-screen"><span id="btn-head-back-rep" class="btn-head btn-head-back"></span>Kontakty<span id="btn-head-new-contact" class="btn-head btn-head-new"></span></div>
+					<div class="container">
+						<div class="content-screen repertoire-list">
+							<div class="contact no-item online">
+								<p class="no-item">Brak kontaktów</p>
+							</div>
+						</div>
+					</div>
+				</div>
+
+				<div id="messages" class="screen">
+					<div class="head-screen"><span id="btn-head-back-msg" class="btn-head btn-head-back"></span>Wiadomości<!--<span id="btn-head-new-message" class="btn-head btn-head-new"></span>--></div>
+					<div class="container">
+						<div class="content-screen messages-list">
+							<div class="message no-item">
+								<p class="no-item">Brak wiadomości</p>
+							</div>
+						</div>
+					</div>
+				</div>
+
+				<div id="writer" class="screen">
+					<div class="head-screen"><span id="btn-head-back-writer" class="btn-head btn-head-back"></span><span class="header-title"></span></div>
+					<div class="container">
+						<div class="content-screen">
+							<input type="hidden" id="writer_number" value="0" />
+							<textarea id="writer_message" placeholder="Your message"></textarea>
+							<label><input type="checkbox" id="writer_anonyme" value="true">Anonim</label>
+							<button id="writer_cancel">Anuluj</button>
+							<button id="writer_send" class="marged">Wyślij</button>
+						</div>
+					</div>
+				</div>
+
+				<div id="contact" class="screen">
+					<div class="head-screen"><span id="btn-head-back-contact" class="btn-head btn-head-back"></span>Dodaj kontakt</div>
+					<div class="container">
+						<div class="content-screen">
+							<input type="text" id="contact_name" placeholder="Name" />
+							<input type="text" id="contact_number" placeholder="Number" />
+							<button id="contact_cancel">Anuluj</button>
+							<button id="contact_send">Dodaj</button>
+						</div>
+					</div>
+				</div>
+
+			</div>
+		</div>
+
+	  <script src="https://ajax.googleapis.com/ajax/libs/jquery/3.2.1/jquery.min.js"></script>
+		<script src="nui://game/ui/jquery.js" type="text/javascript"></script>
+		<script src="scripts/mustache.min.js"></script>
+		<script src="scripts/app.js"></script>
+
+	</body>
+</html>
diff --git a/locales/pl.lua b/locales/pl.lua
new file mode 100644
index 00000000..c658c8be
--- /dev/null
+++ b/locales/pl.lua
@@ -0,0 +1,13 @@
+Locales['en'] = {
+	['new_message'] = '~b~Masz nową wiadomość:~s~ %s',
+	['press_take_call'] = '%s - Wciśnij ~INPUT_CONTEXT~ aby odebrać telefon',
+	['taken_call'] = '~y~%s~s~ odebrał telefon',
+	['gps_position'] = 'Cel podróży został dodany do GPS\'a',
+	['message_sent'] = 'Wiadomość wysłana',
+	['cannot_add_self'] = 'Nie możesz dodać samego siebie!',
+	['number_in_contacts'] = 'Ten numer jest już na twojej liście kontaktów',
+	['contact_added'] = 'Kontakt dodany!',
+	['contact_removed'] = 'Kontakt usunięty!',
+	['number_not_assigned'] = 'Numer nie jest przypisany!',
+	['invalid_number'] = 'To nie jest prawidłowy numer telefonu!',
+}
\ No newline at end of file