diff --git a/MessengerProj/src/main/java/com/b44t/messenger/MusicBrowserService.java b/MessengerProj/src/main/java/com/b44t/messenger/MusicBrowserService.java
index 16ef04b46..22d7d4fa4 100644
--- a/MessengerProj/src/main/java/com/b44t/messenger/MusicBrowserService.java
+++ b/MessengerProj/src/main/java/com/b44t/messenger/MusicBrowserService.java
@@ -318,7 +318,7 @@ public class MusicBrowserService extends MediaBrowserService implements Notifica
                     }
                 }
                 if (avatar == null || bitmap == null) {
-                    builder.setIconUri(Uri.parse("android.resource://" + getApplicationContext().getPackageName() + "/drawable/audiosend_play"));
+                    builder.setIconUri(Uri.parse("android.resource://" + getApplicationContext().getPackageName() + "/drawable/attach_audio_inlist_play"));
                 }
                 mediaItems.add(new MediaBrowser.MediaItem(builder.build(), MediaBrowser.MediaItem.FLAG_BROWSABLE));
             }
diff --git a/MessengerProj/src/main/java/com/b44t/ui/ActionBar/Theme.java b/MessengerProj/src/main/java/com/b44t/ui/ActionBar/Theme.java
index 82ecfe3f8..4dbde7eef 100644
--- a/MessengerProj/src/main/java/com/b44t/ui/ActionBar/Theme.java
+++ b/MessengerProj/src/main/java/com/b44t/ui/ActionBar/Theme.java
@@ -165,7 +165,7 @@ public class Theme {
             timeStickerBackgroundDrawable = context.getResources().getDrawable(R.drawable.phototime2);
             systemDrawable = context.getResources().getDrawable(R.drawable.system);
 
-            fileDrawable = context.getResources().getDrawable(R.drawable.file);
+            fileDrawable = context.getResources().getDrawable(R.drawable.attach_file_inlist);
 
             photoStatesDrawables[0][0] = context.getResources().getDrawable(R.drawable.photoload);
             photoStatesDrawables[0][1] = context.getResources().getDrawable(R.drawable.photoload_pressed);
diff --git a/MessengerProj/src/main/java/com/b44t/ui/Cells/AudioCell.java b/MessengerProj/src/main/java/com/b44t/ui/Cells/AudioCell.java
index 7146389b6..3d025445a 100644
--- a/MessengerProj/src/main/java/com/b44t/ui/Cells/AudioCell.java
+++ b/MessengerProj/src/main/java/com/b44t/ui/Cells/AudioCell.java
@@ -81,12 +81,12 @@ public class AudioCell extends FrameLayout {
                 if (audioEntry != null) {
                     if (MediaController.getInstance().isPlayingAudio(audioEntry.messageObject) && !MediaController.getInstance().isAudioPaused()) {
                         MediaController.getInstance().pauseAudio(audioEntry.messageObject);
-                        playButton.setImageResource(R.drawable.audiosend_play);
+                        playButton.setImageResource(R.drawable.attach_audio_inlist_play);
                     } else {
                         ArrayList<MessageObject> arrayList = new ArrayList<>();
                         arrayList.add(audioEntry.messageObject);
                         if (MediaController.getInstance().setPlaylist(arrayList, audioEntry.messageObject)) {
-                            playButton.setImageResource(R.drawable.audiosend_pause);
+                            playButton.setImageResource(R.drawable.attach_audio_inlist_pause);
                             if (delegate != null) {
                                 delegate.startedPlayingAudio(audioEntry.messageObject);
                             }
@@ -154,7 +154,7 @@ public class AudioCell extends FrameLayout {
         genreTextView.setText(audioEntry.genre);
         authorTextView.setText(audioEntry.author);
         timeTextView.setText(String.format("%d:%02d", audioEntry.duration / 60, audioEntry.duration % 60));
-        playButton.setImageResource(MediaController.getInstance().isPlayingAudio(audioEntry.messageObject) && !MediaController.getInstance().isAudioPaused() ? R.drawable.audiosend_pause : R.drawable.audiosend_play);
+        playButton.setImageResource(MediaController.getInstance().isPlayingAudio(audioEntry.messageObject) && !MediaController.getInstance().isAudioPaused() ? R.drawable.attach_audio_inlist_pause : R.drawable.attach_audio_inlist_play);
 
         needDivider = divider;
         setWillNotDraw(!divider);
diff --git a/MessengerProj/src/main/java/com/b44t/ui/Cells/SharedDocumentCell.java b/MessengerProj/src/main/java/com/b44t/ui/Cells/SharedDocumentCell.java
index cb0aaacbb..87eb15a65 100644
--- a/MessengerProj/src/main/java/com/b44t/ui/Cells/SharedDocumentCell.java
+++ b/MessengerProj/src/main/java/com/b44t/ui/Cells/SharedDocumentCell.java
@@ -111,7 +111,7 @@ public class SharedDocumentCell extends FrameLayout {
             dateTextView.setText(value);
         }
         if (resId == 0) {
-            placeholderImageView.setImageResource(R.drawable.file);
+            placeholderImageView.setImageResource(R.drawable.attach_file_inlist);
             placeholderImageView.setVisibility(VISIBLE);
         } else {
             placeholderImageView.setVisibility(INVISIBLE);
diff --git a/MessengerProj/src/main/res/drawable-hdpi/audiosend_pause.png b/MessengerProj/src/main/res/drawable-hdpi/audiosend_pause.png
deleted file mode 100755
index 3900d8151..000000000
Binary files a/MessengerProj/src/main/res/drawable-hdpi/audiosend_pause.png and /dev/null differ
diff --git a/MessengerProj/src/main/res/drawable-hdpi/audiosend_play.png b/MessengerProj/src/main/res/drawable-hdpi/audiosend_play.png
deleted file mode 100755
index 4b13c02e6..000000000
Binary files a/MessengerProj/src/main/res/drawable-hdpi/audiosend_play.png and /dev/null differ
diff --git a/MessengerProj/src/main/res/drawable-hdpi/share.png b/MessengerProj/src/main/res/drawable-hdpi/share.png
deleted file mode 100755
index 8b853cf2d..000000000
Binary files a/MessengerProj/src/main/res/drawable-hdpi/share.png and /dev/null differ
diff --git a/MessengerProj/src/main/res/drawable-hdpi/sharedmedia.png b/MessengerProj/src/main/res/drawable-hdpi/sharedmedia.png
deleted file mode 100755
index 532e67de0..000000000
Binary files a/MessengerProj/src/main/res/drawable-hdpi/sharedmedia.png and /dev/null differ
diff --git a/MessengerProj/src/main/res/drawable-mdpi/audiosend_pause.png b/MessengerProj/src/main/res/drawable-mdpi/audiosend_pause.png
deleted file mode 100755
index df9cc8f14..000000000
Binary files a/MessengerProj/src/main/res/drawable-mdpi/audiosend_pause.png and /dev/null differ
diff --git a/MessengerProj/src/main/res/drawable-mdpi/audiosend_play.png b/MessengerProj/src/main/res/drawable-mdpi/audiosend_play.png
deleted file mode 100755
index b2352c30a..000000000
Binary files a/MessengerProj/src/main/res/drawable-mdpi/audiosend_play.png and /dev/null differ
diff --git a/MessengerProj/src/main/res/drawable-mdpi/share.png b/MessengerProj/src/main/res/drawable-mdpi/share.png
deleted file mode 100755
index 48a9439cb..000000000
Binary files a/MessengerProj/src/main/res/drawable-mdpi/share.png and /dev/null differ
diff --git a/MessengerProj/src/main/res/drawable-mdpi/sharedmedia.png b/MessengerProj/src/main/res/drawable-mdpi/sharedmedia.png
deleted file mode 100755
index cc21392b4..000000000
Binary files a/MessengerProj/src/main/res/drawable-mdpi/sharedmedia.png and /dev/null differ
diff --git a/MessengerProj/src/main/res/drawable-xhdpi/attach_audio_inlist_pause.png b/MessengerProj/src/main/res/drawable-xhdpi/attach_audio_inlist_pause.png
new file mode 100755
index 000000000..453c9ee46
Binary files /dev/null and b/MessengerProj/src/main/res/drawable-xhdpi/attach_audio_inlist_pause.png differ
diff --git a/MessengerProj/src/main/res/drawable-xhdpi/attach_audio_inlist_play.png b/MessengerProj/src/main/res/drawable-xhdpi/attach_audio_inlist_play.png
new file mode 100755
index 000000000..15375850d
Binary files /dev/null and b/MessengerProj/src/main/res/drawable-xhdpi/attach_audio_inlist_play.png differ
diff --git a/MessengerProj/src/main/res/drawable-xhdpi/file.png b/MessengerProj/src/main/res/drawable-xhdpi/attach_file_inlist.png
similarity index 100%
rename from MessengerProj/src/main/res/drawable-xhdpi/file.png
rename to MessengerProj/src/main/res/drawable-xhdpi/attach_file_inlist.png
diff --git a/MessengerProj/src/main/res/drawable-xhdpi/audiosend_pause.png b/MessengerProj/src/main/res/drawable-xhdpi/audiosend_pause.png
deleted file mode 100755
index 347a02990..000000000
Binary files a/MessengerProj/src/main/res/drawable-xhdpi/audiosend_pause.png and /dev/null differ
diff --git a/MessengerProj/src/main/res/drawable-xhdpi/audiosend_play.png b/MessengerProj/src/main/res/drawable-xhdpi/audiosend_play.png
deleted file mode 100755
index 1a0b026ba..000000000
Binary files a/MessengerProj/src/main/res/drawable-xhdpi/audiosend_play.png and /dev/null differ
diff --git a/MessengerProj/src/main/res/drawable-xhdpi/share.png b/MessengerProj/src/main/res/drawable-xhdpi/share.png
deleted file mode 100755
index d554570d9..000000000
Binary files a/MessengerProj/src/main/res/drawable-xhdpi/share.png and /dev/null differ
diff --git a/MessengerProj/src/main/res/drawable-xhdpi/sharedmedia.png b/MessengerProj/src/main/res/drawable-xhdpi/sharedmedia.png
deleted file mode 100755
index ad1203f6d..000000000
Binary files a/MessengerProj/src/main/res/drawable-xhdpi/sharedmedia.png and /dev/null differ
diff --git a/MessengerProj/src/main/res/drawable-xxhdpi/audiosend_pause.png b/MessengerProj/src/main/res/drawable-xxhdpi/audiosend_pause.png
deleted file mode 100755
index 6a227efc2..000000000
Binary files a/MessengerProj/src/main/res/drawable-xxhdpi/audiosend_pause.png and /dev/null differ
diff --git a/MessengerProj/src/main/res/drawable-xxhdpi/audiosend_play.png b/MessengerProj/src/main/res/drawable-xxhdpi/audiosend_play.png
deleted file mode 100755
index 40478b917..000000000
Binary files a/MessengerProj/src/main/res/drawable-xxhdpi/audiosend_play.png and /dev/null differ
diff --git a/MessengerProj/src/main/res/drawable-xxhdpi/share.png b/MessengerProj/src/main/res/drawable-xxhdpi/share.png
deleted file mode 100755
index b72403da1..000000000
Binary files a/MessengerProj/src/main/res/drawable-xxhdpi/share.png and /dev/null differ
diff --git a/MessengerProj/src/main/res/drawable-xxhdpi/sharedmedia.png b/MessengerProj/src/main/res/drawable-xxhdpi/sharedmedia.png
deleted file mode 100755
index 80dfc3838..000000000
Binary files a/MessengerProj/src/main/res/drawable-xxhdpi/sharedmedia.png and /dev/null differ