diff --git a/htdocs/includes/modules/modMilestone.class.php b/htdocs/includes/modules/modMilestone.class.php
index bc9f27cfd05..86056c70e08 100644
--- a/htdocs/includes/modules/modMilestone.class.php
+++ b/htdocs/includes/modules/modMilestone.class.php
@@ -55,7 +55,7 @@ class modMilestone extends DolibarrModules
 
 		$this->const_name = 'MAIN_MODULE_'.strtoupper($this->name);
 		$this->special = 2;
-		$this->picto = 'milestone';
+		$this->picto = 'milestone@milestone';
 
 		// Data directories to create when module is enabled
 		$this->dirs = array();
@@ -65,7 +65,7 @@ class modMilestone extends DolibarrModules
 
 		// Config pages
 		$this->config_page_url = array();
-		$this->langfiles = array("milestone");
+		$this->langfiles = array("@milestone");
 
 		// Constantes
 		$this->const = array();
@@ -112,6 +112,8 @@ class modMilestone extends DolibarrModules
 	function init()
 	{
 		$sql = array();
+		
+		$result=$this->load_tables();
 
 		return $this->_init($sql);
 	}
@@ -128,6 +130,16 @@ class modMilestone extends DolibarrModules
 
 		return $this->_remove($sql);
 	}
+	
+	/**
+	 *		\brief		Create tables and keys required by module
+	 *					This function is called by this->init.
+	 * 		\return		int		<=0 if KO, >0 if OK
+	 */
+	function load_tables()
+	{
+		return $this->_load_tables('/milestone/sql/');
+	}
 
 }
 ?>
diff --git a/htdocs/install/mysql/migration/2.8.0-2.9.0.sql b/htdocs/install/mysql/migration/2.8.0-2.9.0.sql
index 811bec38c3b..ed6ae8f2fb1 100755
--- a/htdocs/install/mysql/migration/2.8.0-2.9.0.sql
+++ b/htdocs/install/mysql/migration/2.8.0-2.9.0.sql
@@ -164,37 +164,9 @@ INSERT INTO llx_c_field_list (rowid, element, entity, name, alias, title, align,
 UPDATE llx_adherent SET pays = null where pays <= '0' and pays != '0';
 ALTER table llx_adherent MODIFY pays integer;
 
--- add milestone module
+-- drop old table
 DROP TABLE llx_projet_milestone;
 ALTER TABLE llx_projet drop column fk_milestone;
-create table llx_milestone
-(
-  rowid					integer AUTO_INCREMENT PRIMARY KEY,
-  label					varchar(255) NOT NULL,
-  description			text,
-  datec					datetime,
-  tms					timestamp,
-  dateo					datetime,
-  datee					datetime,
-  priority				integer	DEFAULT 0,
-  fk_user_creat			integer,
-  rang					integer	DEFAULT 0
-)type=innodb;
-
-ALTER TABLE llx_milestone ADD INDEX idx_milestone_fk_user_creat (fk_user_creat);
-ALTER TABLE llx_milestone ADD CONSTRAINT fk_milestone_fk_user_creat FOREIGN KEY (fk_user_creat) REFERENCES llx_user (rowid);
-
-create table llx_element_milestone
-(
-  rowid           	integer AUTO_INCREMENT PRIMARY KEY,  
-  fk_element		integer NOT NULL,
-  elementtype		varchar(16) NOT NULL,
-  fk_milestone		integer NOT NULL
-) type=innodb;
-
-ALTER TABLE llx_element_milestone ADD UNIQUE INDEX idx_element_milestone_idx1 (fk_element, elementtype, fk_milestone);
-ALTER TABLE llx_element_milestone ADD INDEX idx_element_milestone_fk_milestone (fk_milestone);
-ALTER TABLE llx_element_milestone ADD CONSTRAINT fk_element_milestone_fk_milestone FOREIGN KEY (fk_milestone) REFERENCES llx_milestone(rowid);
 
 ALTER TABLE llx_deplacement ADD COLUMN fk_statut INTEGER DEFAULT 1  NOT NULL after type;
 
diff --git a/htdocs/theme/auguria/img/object_milestone.png b/htdocs/milestone/img/object_milestone.png
similarity index 100%
rename from htdocs/theme/auguria/img/object_milestone.png
rename to htdocs/milestone/img/object_milestone.png
diff --git a/htdocs/milestone/langs/fr_FR/milestone.lang b/htdocs/milestone/langs/fr_FR/milestone.lang
new file mode 100644
index 00000000000..4d9215be304
--- /dev/null
+++ b/htdocs/milestone/langs/fr_FR/milestone.lang
@@ -0,0 +1,9 @@
+# Dolibarr language file - fr_FR - milestone
+CHARSET=UTF-8
+
+Module1790Name= Jalons
+Module1790Desc= Gestion des jalons (projets, contrats, propales, ...)
+
+Milestone=Jalon
+Milestones=Jalons
+NewMilestone=Nouveau jalon
diff --git a/htdocs/install/mysql/tables/llx_element_milestone.key.sql b/htdocs/milestone/sql/llx_element_milestone.key.sql
similarity index 100%
rename from htdocs/install/mysql/tables/llx_element_milestone.key.sql
rename to htdocs/milestone/sql/llx_element_milestone.key.sql
diff --git a/htdocs/install/mysql/tables/llx_element_milestone.sql b/htdocs/milestone/sql/llx_element_milestone.sql
similarity index 100%
rename from htdocs/install/mysql/tables/llx_element_milestone.sql
rename to htdocs/milestone/sql/llx_element_milestone.sql
diff --git a/htdocs/install/mysql/tables/llx_milestone.key.sql b/htdocs/milestone/sql/llx_milestone.key.sql
similarity index 100%
rename from htdocs/install/mysql/tables/llx_milestone.key.sql
rename to htdocs/milestone/sql/llx_milestone.key.sql
diff --git a/htdocs/install/mysql/tables/llx_milestone.sql b/htdocs/milestone/sql/llx_milestone.sql
similarity index 100%
rename from htdocs/install/mysql/tables/llx_milestone.sql
rename to htdocs/milestone/sql/llx_milestone.sql
diff --git a/htdocs/theme/bluelagoon/img/object_milestone.png b/htdocs/theme/bluelagoon/img/object_milestone.png
deleted file mode 100644
index b3a1c8bcb00..00000000000
Binary files a/htdocs/theme/bluelagoon/img/object_milestone.png and /dev/null differ
diff --git a/htdocs/theme/eldy/img/object_milestone.png b/htdocs/theme/eldy/img/object_milestone.png
deleted file mode 100644
index b3a1c8bcb00..00000000000
Binary files a/htdocs/theme/eldy/img/object_milestone.png and /dev/null differ
diff --git a/htdocs/theme/freelug/img/object_milestone.png b/htdocs/theme/freelug/img/object_milestone.png
deleted file mode 100644
index b3a1c8bcb00..00000000000
Binary files a/htdocs/theme/freelug/img/object_milestone.png and /dev/null differ
diff --git a/htdocs/theme/rodolphe/img/object_milestone.png b/htdocs/theme/rodolphe/img/object_milestone.png
deleted file mode 100644
index b3a1c8bcb00..00000000000
Binary files a/htdocs/theme/rodolphe/img/object_milestone.png and /dev/null differ
diff --git a/htdocs/theme/yellow/img/object_milestone.png b/htdocs/theme/yellow/img/object_milestone.png
deleted file mode 100644
index b3a1c8bcb00..00000000000
Binary files a/htdocs/theme/yellow/img/object_milestone.png and /dev/null differ