diff --git a/filemanager/templates/mobile/app.css b/filemanager/templates/mobile/app.css
new file mode 100644
index 0000000000..df45899081
--- /dev/null
+++ b/filemanager/templates/mobile/app.css
@@ -0,0 +1,77 @@
+/**
+ *
+ * Filemanager - Mobile
+ *
+ * Please do NOT change app.css directly, instead change app.less and compile it!
+ * Pixleegg Template app.css
+ * @link http://www.egroupware.org
+ * @license http://opensource.org/licenses/gpl-license.php GPL - GNU General Public License
+ * @author Hadi Nategh <hn@stylite.de>
+ * @package Filemanager
+ * @version $Id: app.less 55033 2016-02-16 18:49:17Z hnategh $
+ */
+/* tablets and smartphones  */
+@media all {
+  #filemanager-index_nm table.egwGridView_outer tbody span[id^='filemanager-index'][id$='size]'] {
+    font-size: 9pt;
+    text-align: right;
+  }
+  #filemanager-index_nm table.egwGridView_outer tbody label[id^='filemanager-index'][id$='name]'] {
+    overflow: hidden;
+    text-overflow: ellipsis;
+    max-width: 100%;
+  }
+  #filemanager-index_nm table.egwGridView_outer tbody label[id^='filemanager-index'][id$='name]'] span {
+    white-space: nowrap;
+  }
+  #filemanager-index_nm #filemanager-index_buttons {
+    position: relative;
+    display: inline-block;
+    overflow: auto;
+    width: 100%;
+  }
+  #filemanager-index_nm #filemanager-index_buttons img {
+    width: 32px;
+    height: 32px;
+    padding-left: 15px;
+  }
+  #filemanager-index_nm #filemanager-index_tarp {
+    display: none !important;
+  }
+  #filemanager-index_nm #filemanager-index_filemanager-index-header_left {
+    height: auto;
+  }
+  .et2_file.plus_button {
+    position: absolute !important;
+    right: 15px;
+    bottom: 15px;
+    border-radius: 50%;
+    width: 60px;
+    height: 60px;
+    background-position: center;
+    z-index: 100;
+    background-color: #0c5da5;
+    box-shadow: 0px 1px 5px 3px silver;
+    background-image: url(../../../pixelegg/images/topmenu_items/mobile/plus_white.svg) !important;
+    background-repeat: no-repeat;
+    background-size: 24px 24px;
+    margin: 0;
+    padding: 0;
+    border: none;
+  }
+  .et2_file.plus_button .et2_file_span {
+    display: none;
+  }
+  .et2_file.plus_button .et2_file_upload {
+    width: 60px;
+    height: 60px;
+    top: 0;
+  }
+  .previewImage img {
+    max-width: 100%;
+  }
+  div#filemanager-file_tabs td.eaclAccount,
+  td.eaclRights {
+    display: block;
+  }
+}
diff --git a/filemanager/templates/mobile/app.less b/filemanager/templates/mobile/app.less
new file mode 100644
index 0000000000..3fcedbefee
--- /dev/null
+++ b/filemanager/templates/mobile/app.less
@@ -0,0 +1,75 @@
+/**
+ *
+ * Filemanager - Mobile
+ *
+ * Please do NOT change app.css directly, instead change app.less and compile it!
+ * Pixleegg Template app.css
+ * @link http://www.egroupware.org
+ * @license http://opensource.org/licenses/gpl-license.php GPL - GNU General Public License
+ * @author Hadi Nategh <hn@stylite.de>
+ * @package Filemanager
+ * @version $Id: app.less 55033 2016-02-16 18:49:17Z hnategh $
+ */
+
+@import (reference) "../../../pixelegg/less/def_buttons.less";
+@import (reference) "../../../pixelegg/less/def_mobile.less";
+/* tablets and smartphones  */
+@media all {
+	#filemanager-index_nm {
+		table.egwGridView_outer tbody {
+			span[id^='filemanager-index'][id$='size]']{
+				.mob-fontsize-s;
+				text-align: right;
+			}
+			label[id^='filemanager-index'][id$='name]'] {
+				overflow: hidden;
+				text-overflow: ellipsis;
+				max-width: 100%;
+				span{
+					white-space: nowrap;
+
+				}
+			}
+		}
+		#filemanager-index_buttons {
+			position: relative;
+			display: inline-block;
+			overflow:auto;
+			width:100%;
+			img{
+				width: 32px;
+				height: 32px;
+				padding-left: 15px;
+			}
+		}
+		#filemanager-index_tarp {display: none !important;}
+		#filemanager-index_filemanager-index-header_left {height:auto;}
+	}
+	.et2_file.plus_button {
+		position: absolute !important;
+		right: 15px;
+		bottom: 15px;
+		border-radius: 50%;
+		width: 60px;
+		height: 60px;
+		background-position: center;
+		z-index: 100;
+		background-color: #0c5da5;
+		box-shadow: 0px 1px 5px 3px silver;
+		background-image: url(../../../pixelegg/images/topmenu_items/mobile/plus_white.svg) !important;
+		background-repeat: no-repeat;
+		background-size: 24px 24px;
+		border: none;
+		margin: 0;
+		padding: 0;
+		border: none;
+		.et2_file_span{display: none;}
+		.et2_file_upload {
+			width: 60px;
+			height: 60px;
+			top: 0;
+		}
+	}
+	.previewImage img {max-width: 100%;}
+	div#filemanager-file_tabs td.eaclAccount,td.eaclRights {display: block;}
+}
\ No newline at end of file
diff --git a/filemanager/templates/pixelegg/app.css b/filemanager/templates/pixelegg/app.css
index 6c1cf06bf7..d1d13962cc 100755
--- a/filemanager/templates/pixelegg/app.css
+++ b/filemanager/templates/pixelegg/app.css
@@ -391,66 +391,3 @@ div#stylite-filemanager-upload .dialogFooterToolbar button:active {
   -moz-box-shadow: inset 1px 2px 1px rgba(0, 0, 0, 0.5);
   box-shadow: inset 1px 2px 1px rgba(0, 0, 0, 0.5);
 }
-/* tablets and smartphones  */
-@media only screen and (max-device-width: 1024px) {
-  #filemanager-index_nm table.egwGridView_outer tbody span[id^='filemanager-index'][id$='size]'] {
-    font-size: 9pt;
-    text-align: right;
-  }
-  #filemanager-index_nm table.egwGridView_outer tbody label[id^='filemanager-index'][id$='name]'] {
-    overflow: hidden;
-    text-overflow: ellipsis;
-    max-width: 100%;
-  }
-  #filemanager-index_nm table.egwGridView_outer tbody label[id^='filemanager-index'][id$='name]'] span {
-    white-space: nowrap;
-  }
-  #filemanager-index_nm #filemanager-index_buttons {
-    position: relative;
-    display: inline-block;
-  }
-  #filemanager-index_nm #filemanager-index_tarp {
-    display: none !important;
-  }
-  #filemanager-index_nm #filemanager-index_filemanager-index-header_left {
-    height: auto;
-  }
-  .et2_file.plus_button {
-    position: absolute !important;
-    right: 15px;
-    bottom: 15px;
-    border-radius: 50%;
-    width: 60px;
-    height: 60px;
-    background-position: center;
-    z-index: 100;
-    background-color: #0c5da5;
-    border: none;
-    box-shadow: 0px 1px 5px 3px silver;
-    background-image: none !important;
-    margin: 0;
-    padding: 0;
-  }
-  .et2_file.plus_button .et2_file_span {
-    display: none;
-  }
-  .et2_file.plus_button .et2_file_upload {
-    width: 60px;
-    height: 60px;
-    top: 0;
-  }
-  .et2_file.plus_button:after {
-    content: '+';
-    font-weight: bold;
-    font-size: 34pt;
-    color: #fafafa;
-    margin-left: 10px;
-  }
-  .previewImage img {
-    max-width: 100%;
-  }
-  div#filemanager-file_tabs td.eaclAccount,
-  td.eaclRights {
-    display: block;
-  }
-}
diff --git a/filemanager/templates/pixelegg/app.less b/filemanager/templates/pixelegg/app.less
index e4edba06ca..8d58840cd0 100644
--- a/filemanager/templates/pixelegg/app.less
+++ b/filemanager/templates/pixelegg/app.less
@@ -159,63 +159,3 @@ div#stylite-filemanager-upload{
 
 }
 
-
-//
-
-/* tablets and smartphones  */
-@media only screen and (max-device-width:1024px) {
-	#filemanager-index_nm {
-		table.egwGridView_outer tbody {
-			span[id^='filemanager-index'][id$='size]']{
-				.mob-fontsize-s;
-				text-align: right;
-			}
-			label[id^='filemanager-index'][id$='name]'] {
-				overflow: hidden;
-				text-overflow: ellipsis;
-				max-width: 100%;
-				span{
-					white-space: nowrap;
-
-				}
-			}
-		}
-		#filemanager-index_buttons {
-			position: relative;
-			display: inline-block;
-		}
-		#filemanager-index_tarp {display: none !important;}
-		#filemanager-index_filemanager-index-header_left {height:auto;}
-	}
-	.et2_file.plus_button {
-		position: absolute !important;
-		right: 15px;
-		bottom: 15px;
-		border-radius: 50%;
-		width: 60px;
-		height: 60px;
-		background-position: center;
-		z-index: 100;
-		background-color: #0c5da5;
-		border: none;
-		box-shadow: 0px 1px 5px 3px silver;
-		background-image: none !important;
-		margin: 0;
-		padding: 0;
-		.et2_file_span{display: none;}
-		.et2_file_upload {
-			width: 60px;
-			height: 60px;
-			top: 0;
-		}
-		&:after{
-			content: '+';
-			font-weight: bold;
-			font-size: 34pt;
-			color: #fafafa;
-			margin-left: 10px;
-		}
-	}
-	.previewImage img {max-width: 100%;}
-	div#filemanager-file_tabs td.eaclAccount,td.eaclRights {display: block;}
-}
\ No newline at end of file