diff --git a/CHANGELOG.md b/CHANGELOG.md
index e40836f..2f06c4d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,6 +3,7 @@
 ## 1.2.0 - Roll n Keep
 - Added Roll n Keep 1st iteration
 - Fix image's behavior on create for all items sub classes
+- Click on rings in the PC/PNC sheet now open the DicePicker with the selected ring
 
 ## 1.1.2 - One Compendium to bring them all
 - Added compendiums (Thanks to Stéfano Fara for the English version !) Partial for French as PoW and CR are not translated yet
diff --git a/system/scripts/actors/base-sheet.js b/system/scripts/actors/base-sheet.js
index f8296ab..73efd90 100644
--- a/system/scripts/actors/base-sheet.js
+++ b/system/scripts/actors/base-sheet.js
@@ -185,6 +185,7 @@ export class BaseSheetL5r5e extends ActorSheet {
             }
 
             new game.l5r5e.DicePickerDialog({
+                ringId: li.data("ring") || null,
                 skillId: skillId,
                 skillCatId: li.data("skillcat") || null,
                 isInitiativeRoll: li.data("initiative") || false,
diff --git a/system/templates/actors/character/rings.html b/system/templates/actors/character/rings.html
index 1e0c134..c35f917 100644
--- a/system/templates/actors/character/rings.html
+++ b/system/templates/actors/character/rings.html
@@ -1,35 +1,35 @@
 <ul class="rings">
     <li id="earth">
         <label class="earth">
-            <i class="i_earth"></i>
+            <i class="i_earth dice-picker rollable" data-ring="earth"></i>
             <strong>{{ localizeRing 'earth' }}</strong>
             <input class="centered-input select-on-focus" type="number" name="data.rings.earth" value="{{data.rings.earth}}" data-dtype="Number" min="1" max="9" placeholder="0"/>
         </label>
     </li>
     <li id="air">
         <label class="air">
-            <i class="i_air"></i>
+            <i class="i_air dice-picker rollable" data-ring="air"></i>
             <strong>{{ localizeRing 'air' }}</strong>
             <input class="centered-input select-on-focus" type="number" name="data.rings.air" value="{{data.rings.air}}" data-dtype="Number" min="1" max="9" placeholder="0"/>
         </label>
     </li>
     <li  id="water">
         <label class="water">
-            <i class="i_water"></i>
+            <i class="i_water dice-picker rollable" data-ring="water"></i>
             <strong>{{ localizeRing 'water' }}</strong>
             <input class="centered-input select-on-focus" type="number" name="data.rings.water" value="{{data.rings.water}}" data-dtype="Number" min="1" max="9" placeholder="0"/>
         </label>
     </li>
     <li id="fire">
         <label class="fire">
-            <i class="i_fire"></i>
+            <i class="i_fire dice-picker rollable" data-ring="fire"></i>
             <strong>{{ localizeRing 'fire' }}</strong>
             <input class="centered-input select-on-focus" type="number" name="data.rings.fire" value="{{data.rings.fire}}" data-dtype="Number" min="1" max="9" placeholder="0"/>
         </label>
     </li>
     <li id="void">
         <label class="void">
-            <i class="i_void"></i>
+            <i class="i_void dice-picker rollable" data-ring="void"></i>
             <strong>{{ localizeRing 'void' }}</strong>
             <input class="centered-input select-on-focus" type="number" name="data.rings.void" value="{{data.rings.void}}" data-dtype="Number" min="1" max="9" placeholder="0"/>
         </label>
diff --git a/system/templates/actors/npc/rings.html b/system/templates/actors/npc/rings.html
index 1bf5087..c35f917 100644
--- a/system/templates/actors/npc/rings.html
+++ b/system/templates/actors/npc/rings.html
@@ -1,35 +1,35 @@
 <ul class="rings">
     <li id="earth">
         <label class="earth">
-            <i class="i_earth"></i>
+            <i class="i_earth dice-picker rollable" data-ring="earth"></i>
             <strong>{{ localizeRing 'earth' }}</strong>
             <input class="centered-input select-on-focus" type="number" name="data.rings.earth" value="{{data.rings.earth}}" data-dtype="Number" min="1" max="9" placeholder="0"/>
         </label>
     </li>
-    <li  id="air">
+    <li id="air">
         <label class="air">
-            <i class="i_air"></i>
+            <i class="i_air dice-picker rollable" data-ring="air"></i>
             <strong>{{ localizeRing 'air' }}</strong>
             <input class="centered-input select-on-focus" type="number" name="data.rings.air" value="{{data.rings.air}}" data-dtype="Number" min="1" max="9" placeholder="0"/>
         </label>
     </li>
     <li  id="water">
         <label class="water">
-            <i class="i_water"></i>
+            <i class="i_water dice-picker rollable" data-ring="water"></i>
             <strong>{{ localizeRing 'water' }}</strong>
             <input class="centered-input select-on-focus" type="number" name="data.rings.water" value="{{data.rings.water}}" data-dtype="Number" min="1" max="9" placeholder="0"/>
         </label>
     </li>
     <li id="fire">
         <label class="fire">
-            <i class="i_fire"></i>
+            <i class="i_fire dice-picker rollable" data-ring="fire"></i>
             <strong>{{ localizeRing 'fire' }}</strong>
             <input class="centered-input select-on-focus" type="number" name="data.rings.fire" value="{{data.rings.fire}}" data-dtype="Number" min="1" max="9" placeholder="0"/>
         </label>
     </li>
     <li id="void">
         <label class="void">
-            <i class="i_void"></i>
+            <i class="i_void dice-picker rollable" data-ring="void"></i>
             <strong>{{ localizeRing 'void' }}</strong>
             <input class="centered-input select-on-focus" type="number" name="data.rings.void" value="{{data.rings.void}}" data-dtype="Number" min="1" max="9" placeholder="0"/>
         </label>