diff --git a/staff/daniel-hernandez/project/app/assets/images/icons/control/index.js b/staff/daniel-hernandez/project/app/assets/images/icons/control/index.js
new file mode 100644
index 000000000..6346c9ca2
--- /dev/null
+++ b/staff/daniel-hernandez/project/app/assets/images/icons/control/index.js
@@ -0,0 +1,5 @@
+import playIcon from './play.png';
+import pauseIcon from './pause.png';
+import loadingIcon from './loading.png';
+
+export { playIcon, pauseIcon, loadingIcon };
diff --git a/staff/daniel-hernandez/project/app/assets/images/icons/control/loading.png b/staff/daniel-hernandez/project/app/assets/images/icons/control/loading.png
new file mode 100644
index 000000000..9cb453052
Binary files /dev/null and b/staff/daniel-hernandez/project/app/assets/images/icons/control/loading.png differ
diff --git a/staff/daniel-hernandez/project/app/assets/images/icons/control/pause.png b/staff/daniel-hernandez/project/app/assets/images/icons/control/pause.png
new file mode 100644
index 000000000..0efca4f61
Binary files /dev/null and b/staff/daniel-hernandez/project/app/assets/images/icons/control/pause.png differ
diff --git a/staff/daniel-hernandez/project/app/assets/images/icons/control/play.png b/staff/daniel-hernandez/project/app/assets/images/icons/control/play.png
new file mode 100644
index 000000000..e7b075650
Binary files /dev/null and b/staff/daniel-hernandez/project/app/assets/images/icons/control/play.png differ
diff --git a/staff/daniel-hernandez/project/app/assets/images/icons/index.js b/staff/daniel-hernandez/project/app/assets/images/icons/index.js
index 1ec2a85ab..b9c2c8cf9 100644
--- a/staff/daniel-hernandez/project/app/assets/images/icons/index.js
+++ b/staff/daniel-hernandez/project/app/assets/images/icons/index.js
@@ -1,4 +1,6 @@
 import * as TabIcons from './tab';
 import * as InputIcons from './input';
+import * as ControlIcons from './control';
+import * as ItemIcons from './item';
 
-export { TabIcons, InputIcons };
+export { TabIcons, InputIcons, ControlIcons, ItemIcons };
diff --git a/staff/daniel-hernandez/project/app/assets/images/icons/input/index.js b/staff/daniel-hernandez/project/app/assets/images/icons/input/index.js
index 17dc1f4d1..31c41f4d4 100644
--- a/staff/daniel-hernandez/project/app/assets/images/icons/input/index.js
+++ b/staff/daniel-hernandez/project/app/assets/images/icons/input/index.js
@@ -1,5 +1,5 @@
 import eyeIcon from './eye.png';
 import eyeIconActive from './eyeActive.png';
-import clear from './clear.png';
+import clearIcon from './clear.png';
 
-export { eyeIcon, eyeIconActive, clear };
+export { eyeIcon, eyeIconActive, clearIcon };
diff --git a/staff/daniel-hernandez/project/app/assets/images/extras/add.png b/staff/daniel-hernandez/project/app/assets/images/icons/item/add.png
similarity index 100%
rename from staff/daniel-hernandez/project/app/assets/images/extras/add.png
rename to staff/daniel-hernandez/project/app/assets/images/icons/item/add.png
diff --git a/staff/daniel-hernandez/project/app/assets/images/extras/check.png b/staff/daniel-hernandez/project/app/assets/images/icons/item/check.png
similarity index 100%
rename from staff/daniel-hernandez/project/app/assets/images/extras/check.png
rename to staff/daniel-hernandez/project/app/assets/images/icons/item/check.png
diff --git a/staff/daniel-hernandez/project/app/assets/images/icons/item/index.js b/staff/daniel-hernandez/project/app/assets/images/icons/item/index.js
new file mode 100644
index 000000000..51b4cce95
--- /dev/null
+++ b/staff/daniel-hernandez/project/app/assets/images/icons/item/index.js
@@ -0,0 +1,5 @@
+import addIcon from './add.png';
+import checkIcon from './check.png';
+import moreIcon from './more.png';
+
+export { addIcon, checkIcon, moreIcon };
diff --git a/staff/daniel-hernandez/project/app/assets/images/extras/more.png b/staff/daniel-hernandez/project/app/assets/images/icons/item/more.png
similarity index 100%
rename from staff/daniel-hernandez/project/app/assets/images/extras/more.png
rename to staff/daniel-hernandez/project/app/assets/images/icons/item/more.png