diff --git a/app/src/main/java/com/simplemobiletools/camera/MainActivity.java b/app/src/main/java/com/simplemobiletools/camera/MainActivity.java
index 945b2acf..d9e6e4ed 100644
--- a/app/src/main/java/com/simplemobiletools/camera/MainActivity.java
+++ b/app/src/main/java/com/simplemobiletools/camera/MainActivity.java
@@ -17,7 +17,7 @@ import butterknife.OnClick;
 
 public class MainActivity extends AppCompatActivity {
     @BindView(R.id.viewHolder) RelativeLayout viewHolder;
-    @BindView(R.id.toggle_camera) View toggleCameraBtn;
+    @BindView(R.id.toggle_camera) ImageView toggleCameraBtn;
     @BindView(R.id.toggle_flash) ImageView toggleFlashBtn;
 
     private Preview preview;
@@ -42,8 +42,10 @@ public class MainActivity extends AppCompatActivity {
     public void toggleCamera() {
         if (currCamera == Camera.CameraInfo.CAMERA_FACING_BACK) {
             currCamera = Camera.CameraInfo.CAMERA_FACING_FRONT;
+            toggleCameraBtn.setImageResource(R.mipmap.camera_rear);
         } else {
             currCamera = Camera.CameraInfo.CAMERA_FACING_BACK;
+            toggleCameraBtn.setImageResource(R.mipmap.camera_front);
         }
 
         disableFlash();
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index 50024fae..56fb20e0 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -16,26 +16,26 @@
         android:layout_height="wrap_content"
         android:layout_alignParentBottom="true"
         android:layout_marginBottom="@dimen/preview_btn_margin"
-        android:gravity="center_horizontal">
+        android:gravity="center_horizontal|bottom">
 
         <ImageView
             android:id="@+id/toggle_camera"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
+            android:layout_width="@dimen/side_icon_size"
+            android:layout_height="@dimen/side_icon_size"
             android:layout_weight="1"
-            android:src="@mipmap/ic_launcher"/>
+            android:src="@mipmap/camera_front"/>
 
         <ImageView
             android:id="@+id/shutter"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
+            android:layout_width="@dimen/main_icon_size"
+            android:layout_height="@dimen/main_icon_size"
             android:layout_weight="1"
-            android:src="@mipmap/ic_launcher"/>
+            android:src="@mipmap/camera"/>
 
         <ImageView
             android:id="@+id/toggle_flash"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
+            android:layout_width="@dimen/side_icon_size"
+            android:layout_height="@dimen/side_icon_size"
             android:layout_weight="1"
             android:src="@mipmap/flash_off"/>
 
diff --git a/app/src/main/res/mipmap-hdpi/camera.png b/app/src/main/res/mipmap-hdpi/camera.png
new file mode 100644
index 00000000..0fe586ad
Binary files /dev/null and b/app/src/main/res/mipmap-hdpi/camera.png differ
diff --git a/app/src/main/res/mipmap-hdpi/camera_front.png b/app/src/main/res/mipmap-hdpi/camera_front.png
new file mode 100644
index 00000000..3eb24d1f
Binary files /dev/null and b/app/src/main/res/mipmap-hdpi/camera_front.png differ
diff --git a/app/src/main/res/mipmap-hdpi/camera_rear.png b/app/src/main/res/mipmap-hdpi/camera_rear.png
new file mode 100644
index 00000000..8392b2a8
Binary files /dev/null and b/app/src/main/res/mipmap-hdpi/camera_rear.png differ
diff --git a/app/src/main/res/mipmap-hdpi/flash_off.png b/app/src/main/res/mipmap-hdpi/flash_off.png
index 3b1d5903..3cf30f3e 100644
Binary files a/app/src/main/res/mipmap-hdpi/flash_off.png and b/app/src/main/res/mipmap-hdpi/flash_off.png differ
diff --git a/app/src/main/res/mipmap-hdpi/flash_on.png b/app/src/main/res/mipmap-hdpi/flash_on.png
index 31e1fc72..4e116af4 100644
Binary files a/app/src/main/res/mipmap-hdpi/flash_on.png and b/app/src/main/res/mipmap-hdpi/flash_on.png differ
diff --git a/app/src/main/res/mipmap-mdpi/camera.png b/app/src/main/res/mipmap-mdpi/camera.png
new file mode 100644
index 00000000..32fa295b
Binary files /dev/null and b/app/src/main/res/mipmap-mdpi/camera.png differ
diff --git a/app/src/main/res/mipmap-mdpi/camera_front.png b/app/src/main/res/mipmap-mdpi/camera_front.png
new file mode 100644
index 00000000..a80ccde5
Binary files /dev/null and b/app/src/main/res/mipmap-mdpi/camera_front.png differ
diff --git a/app/src/main/res/mipmap-mdpi/camera_rear.png b/app/src/main/res/mipmap-mdpi/camera_rear.png
new file mode 100644
index 00000000..b0768e30
Binary files /dev/null and b/app/src/main/res/mipmap-mdpi/camera_rear.png differ
diff --git a/app/src/main/res/mipmap-mdpi/flash_off.png b/app/src/main/res/mipmap-mdpi/flash_off.png
new file mode 100644
index 00000000..23c854e9
Binary files /dev/null and b/app/src/main/res/mipmap-mdpi/flash_off.png differ
diff --git a/app/src/main/res/mipmap-mdpi/flash_on.png b/app/src/main/res/mipmap-mdpi/flash_on.png
new file mode 100644
index 00000000..bedc4eb8
Binary files /dev/null and b/app/src/main/res/mipmap-mdpi/flash_on.png differ
diff --git a/app/src/main/res/mipmap-xhdpi/camera.png b/app/src/main/res/mipmap-xhdpi/camera.png
new file mode 100644
index 00000000..d3716553
Binary files /dev/null and b/app/src/main/res/mipmap-xhdpi/camera.png differ
diff --git a/app/src/main/res/mipmap-xhdpi/camera_front.png b/app/src/main/res/mipmap-xhdpi/camera_front.png
new file mode 100644
index 00000000..951bc12c
Binary files /dev/null and b/app/src/main/res/mipmap-xhdpi/camera_front.png differ
diff --git a/app/src/main/res/mipmap-xhdpi/camera_rear.png b/app/src/main/res/mipmap-xhdpi/camera_rear.png
new file mode 100644
index 00000000..8b2415ba
Binary files /dev/null and b/app/src/main/res/mipmap-xhdpi/camera_rear.png differ
diff --git a/app/src/main/res/mipmap-xhdpi/flash_off.png b/app/src/main/res/mipmap-xhdpi/flash_off.png
new file mode 100644
index 00000000..1d774f24
Binary files /dev/null and b/app/src/main/res/mipmap-xhdpi/flash_off.png differ
diff --git a/app/src/main/res/mipmap-xhdpi/flash_on.png b/app/src/main/res/mipmap-xhdpi/flash_on.png
new file mode 100644
index 00000000..cb606113
Binary files /dev/null and b/app/src/main/res/mipmap-xhdpi/flash_on.png differ
diff --git a/app/src/main/res/mipmap-xxhdpi/camera.png b/app/src/main/res/mipmap-xxhdpi/camera.png
new file mode 100644
index 00000000..acee078b
Binary files /dev/null and b/app/src/main/res/mipmap-xxhdpi/camera.png differ
diff --git a/app/src/main/res/mipmap-xxhdpi/camera_front.png b/app/src/main/res/mipmap-xxhdpi/camera_front.png
new file mode 100644
index 00000000..9f43e207
Binary files /dev/null and b/app/src/main/res/mipmap-xxhdpi/camera_front.png differ
diff --git a/app/src/main/res/mipmap-xxhdpi/camera_rear.png b/app/src/main/res/mipmap-xxhdpi/camera_rear.png
new file mode 100644
index 00000000..e3cac8e7
Binary files /dev/null and b/app/src/main/res/mipmap-xxhdpi/camera_rear.png differ
diff --git a/app/src/main/res/mipmap-xxhdpi/flash_off.png b/app/src/main/res/mipmap-xxhdpi/flash_off.png
new file mode 100644
index 00000000..2a1c047f
Binary files /dev/null and b/app/src/main/res/mipmap-xxhdpi/flash_off.png differ
diff --git a/app/src/main/res/mipmap-xxhdpi/flash_on.png b/app/src/main/res/mipmap-xxhdpi/flash_on.png
new file mode 100644
index 00000000..7f6306af
Binary files /dev/null and b/app/src/main/res/mipmap-xxhdpi/flash_on.png differ
diff --git a/app/src/main/res/mipmap-xxxhdpi/camera.png b/app/src/main/res/mipmap-xxxhdpi/camera.png
new file mode 100644
index 00000000..1d69c89f
Binary files /dev/null and b/app/src/main/res/mipmap-xxxhdpi/camera.png differ
diff --git a/app/src/main/res/mipmap-xxxhdpi/camera_front.png b/app/src/main/res/mipmap-xxxhdpi/camera_front.png
new file mode 100644
index 00000000..134fdc51
Binary files /dev/null and b/app/src/main/res/mipmap-xxxhdpi/camera_front.png differ
diff --git a/app/src/main/res/mipmap-xxxhdpi/camera_rear.png b/app/src/main/res/mipmap-xxxhdpi/camera_rear.png
new file mode 100644
index 00000000..1eec9575
Binary files /dev/null and b/app/src/main/res/mipmap-xxxhdpi/camera_rear.png differ
diff --git a/app/src/main/res/mipmap-xxxhdpi/flash_off.png b/app/src/main/res/mipmap-xxxhdpi/flash_off.png
new file mode 100644
index 00000000..a192b0ef
Binary files /dev/null and b/app/src/main/res/mipmap-xxxhdpi/flash_off.png differ
diff --git a/app/src/main/res/mipmap-xxxhdpi/flash_on.png b/app/src/main/res/mipmap-xxxhdpi/flash_on.png
new file mode 100644
index 00000000..79e4e3ba
Binary files /dev/null and b/app/src/main/res/mipmap-xxxhdpi/flash_on.png differ
diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml
index fdb8dbb3..065f8499 100644
--- a/app/src/main/res/values/dimens.xml
+++ b/app/src/main/res/values/dimens.xml
@@ -1,4 +1,6 @@
 <resources>
     <dimen name="activity_margin">16dp</dimen>
     <dimen name="preview_btn_margin">32dp</dimen>
+    <dimen name="side_icon_size">36dp</dimen>
+    <dimen name="main_icon_size">48dp</dimen>
 </resources>